diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c
index 3d4c3ee16..27d0bc2fb 100644
--- a/bin/xbps-create/main.c
+++ b/bin/xbps-create/main.c
@@ -400,11 +400,11 @@ ftw_cb(const char *fpath, const struct stat *sb, const struct dirent *dir UNUSED
 	if (xe == NULL)
 		die("calloc");
 
-	/* XXX: fileinfo contains the sanatized path, whereas xe contains the
-	 * unsanatized path!
+	/* XXX: fileinfo contains the sanitized path, whereas xe contains the
+	 * unsanitized path!
 	 *
 	 * when handing the files over, do not use the dictionary directly. Instead
-	 * use the keysym, as this value has the unsanatized path.
+	 * use the keysym, as this value has the unsanitized path.
 	 */
 	xbps_dictionary_set_cstring(fileinfo, "file", filep);
 	xbps_dictionary_set(all_filesd, fpath, fileinfo);
diff --git a/bin/xbps-fbulk/main.c b/bin/xbps-fbulk/main.c
index 249869d84..4a54bc431 100644
--- a/bin/xbps-fbulk/main.c
+++ b/bin/xbps-fbulk/main.c
@@ -297,7 +297,7 @@ waitRunning(int flags)
 
 /*
  * Start new builds from the build list and handle build completions,
- * which can potentialy add new items to the build list.
+ * which can potentially add new items to the build list.
  *
  * This routine will maintain up to NParallel builds.  A new build is
  * only started once its dependencies have completed successfully so
@@ -480,12 +480,12 @@ ordered_depends(const char *bpath, const char *pkgn)
 		if (stat(dpath, &st) == -1) {
 			/*
 			 * Ignore unexistent dependencies, this
-			 * might happen for virtual packages or 
+			 * might happen for virtual packages or
 			 * autogenerated pkgs (-32bit, etc).
 			 *
 			 * We don't really care if the pkg has
 			 * invalid dependencies, at build time they
-			 * will be properly catched by xbps-src.
+			 * will be properly caught by xbps-src.
 			 */
 			continue;
 		}
diff --git a/bin/xbps-install/xbps-install.1 b/bin/xbps-install/xbps-install.1
index 020edff60..38d9ea1f1 100644
--- a/bin/xbps-install/xbps-install.1
+++ b/bin/xbps-install/xbps-install.1
@@ -64,7 +64,7 @@ Currently the following modes are available:
 .It Sy hold
 The package is on hold mode.
 Packages in this mode won't be updated unless
-it's explicitely declared to be updated.
+it's explicitly declared to be updated.
 The only way to update packages in this mode is by using the
 .Fl f , Fl -force
 option.
diff --git a/bin/xbps-query/xbps-query.1 b/bin/xbps-query/xbps-query.1
index 6eef45568..cbe8ee503 100644
--- a/bin/xbps-query/xbps-query.1
+++ b/bin/xbps-query/xbps-query.1
@@ -58,7 +58,7 @@ Currently the following modes are available:
 .Bl -tag -width -x
 .It Sy hold
 The package is on hold mode.
-Packages in this mode won't be updated unless it's explicitely declared to be updated.
+Packages in this mode won't be updated unless it's explicitly declared to be updated.
 The only way to update packages in this mode is by using the
 .Fl f, Fl -force
 option.
diff --git a/bin/xbps-rindex/index-add.c b/bin/xbps-rindex/index-add.c
index 727053b56..2a5a526aa 100644
--- a/bin/xbps-rindex/index-add.c
+++ b/bin/xbps-rindex/index-add.c
@@ -106,7 +106,7 @@ repodata_commit(const char *repodir, const char *repoarch,
 	xbps_object_iterator_release(iter);
 
 	/*
-	 * purge all packages that are fullfilled by the index and
+	 * purge all packages that are fulfilled by the index and
 	 * not in the stage.
 	 */
 	iter = xbps_dictionary_iterator(index);
@@ -130,7 +130,7 @@ repodata_commit(const char *repodir, const char *repoarch,
 	xbps_object_iterator_release(iter);
 
 	/*
-	 * purge all packages that are fullfilled by the stage
+	 * purge all packages that are fulfilled by the stage
 	 */
 	iter = xbps_dictionary_iterator(stage);
 	while ((keysym = xbps_object_iterator_next(iter))) {
diff --git a/configure b/configure
index 43ef7e742..846c57348 100755
--- a/configure
+++ b/configure
@@ -338,7 +338,7 @@ fi
 #
 check_compiler_flag "std=c99" "" CFLAGS
 if [ $? -ne 0 ]; then
-	echo "ERRROR: A compatible C99 compiler is required, exiting..."
+	echo "ERROR: A compatible C99 compiler is required, exiting..."
 	exit 1
 fi
 #
diff --git a/data/xbps.7 b/data/xbps.7
index a1cd00e1e..e0ed49c75 100644
--- a/data/xbps.7
+++ b/data/xbps.7
@@ -77,7 +77,7 @@ Currently the following modes are available:
 .It Sy hold
 The package is on hold mode.
 Packages in this mode won't be updated unless
-it's explicitely declared to be updated.
+it's explicitly declared to be updated.
 The only way to update packages in this mode is by using the
 .Fl f , Fl -force
 option.
diff --git a/data/xbps.conf b/data/xbps.conf
index 238351acb..cd866b63a 100644
--- a/data/xbps.conf
+++ b/data/xbps.conf
@@ -14,7 +14,7 @@
 #syslog=true
 
 # Enable package best matching (disabled by default). If enabled a package with
-# the greatest version available in all repositories will be choosen, rather
+# the greatest version available in all repositories will be chosen, rather
 # than on the first package matching the expression.
 #
 #bestmatching=true
diff --git a/include/mainpage.h b/include/mainpage.h
index 55a77119f..13fb446d8 100644
--- a/include/mainpage.h
+++ b/include/mainpage.h
@@ -18,7 +18,7 @@
  *
  * http://www.apple.com/DTDs/PropertyList-1.0.dtd
  *
- * NetBSD's proplib has been choosed because it's fast, extensible, and easy
+ * NetBSD's proplib has been chosen because it's fast, extensible, and easy
  * to use. These are the three facts I mentioned:
  *
  *  - <b>Fast</b> because proplib uses an ultra optimized
diff --git a/include/xbps.h.in b/include/xbps.h.in
index 6a35eebbd..19c7eba13 100644
--- a/include/xbps.h.in
+++ b/include/xbps.h.in
@@ -167,7 +167,7 @@
 /**
  * @def XBPS_FLAG_FORCE_UNPACK
  * Force flag used in xbps_unpack_binary_pkg(). If set its package
- * files will be unpacked overwritting the current ones.
+ * files will be unpacked overwriting the current ones.
  * Must be set through the xbps_handle::flags member.
  */
 #define XBPS_FLAG_FORCE_UNPACK 		0x00000040
@@ -488,7 +488,7 @@ struct xbps_fetch_cb_data {
 	/**
 	 * @var cb_end
 	 *
-	 * If true the function callback should be prepated to
+	 * If true the function callback should be prepared to
 	 * end the transfer progress.
 	 */
 	bool cb_end;
@@ -888,7 +888,7 @@ int xbps_fetch_file_dest_sha256(struct xbps_handle *xhp, const char *uri,
 /**
  * Returns last error string reported by xbps_fetch_file().
  *
- * @return A string with the appropiate error message.
+ * @return A string with the appropriate error message.
  */
 const char *xbps_fetch_error_string(void);
 
@@ -904,7 +904,7 @@ const char *xbps_fetch_error_string(void);
  * packages that should be treated as they were already removed (optional).
  *
  * @return A proplib array of dictionaries with all orphans found,
- * on error NULL is returned and errno is set appropiately.
+ * on error NULL is returned and errno is set appropriately.
  */
 xbps_array_t xbps_find_pkg_orphans(struct xbps_handle *xhp, xbps_array_t orphans);
 
@@ -1196,7 +1196,7 @@ bool xbps_match_any_virtualpkg_in_rundeps(xbps_array_t rundeps, xbps_array_t pro
  * @param[in] array The proplib array to search on.
  * @param[in] pkgname The package name to match.
  *
- * @return true on success, false otherwise and errno is set appropiately.
+ * @return true on success, false otherwise and errno is set appropriately.
  */
 bool xbps_match_pkgname_in_array(xbps_array_t array, const char *pkgname);
 
@@ -1206,7 +1206,7 @@ bool xbps_match_pkgname_in_array(xbps_array_t array, const char *pkgname);
  * @param[in] array The proplib array to search on.
  * @param[in] pkgver The package name/version to match.
  *
- * @return true on success, false otherwise and errno is set appropiately.
+ * @return true on success, false otherwise and errno is set appropriately.
  */
 bool xbps_match_pkgver_in_array(xbps_array_t array, const char *pkgver);
 
@@ -1216,7 +1216,7 @@ bool xbps_match_pkgver_in_array(xbps_array_t array, const char *pkgver);
  * @param[in] array The proplib array to search on.
  * @param[in] pattern The package pattern to match, i.e `foo>=0' or `foo<1'.
  *
- * @return true on success, false otherwise and errno is set appropiately.
+ * @return true on success, false otherwise and errno is set appropriately.
  */
 bool xbps_match_pkgpattern_in_array(xbps_array_t array, const char *pattern);
 
@@ -1227,7 +1227,7 @@ bool xbps_match_pkgpattern_in_array(xbps_array_t array, const char *pattern);
  * @param[in] array The proplib array to search on.
  * @param[in] pkgver The package name-version to match, i.e `foo-1.0_1'.
  *
- * @return true on success, false otherwise and errno is set appropiately.
+ * @return true on success, false otherwise and errno is set appropriately.
  */
 bool xbps_match_pkgdep_in_array(xbps_array_t array, const char *pkgver);
 
@@ -1237,7 +1237,7 @@ bool xbps_match_pkgdep_in_array(xbps_array_t array, const char *pkgver);
  * @param[in] array The proplib array to search on.
  * @param[in] val The string to be matched.
  *
- * @return true on success, false otherwise and errno is set appropiately.
+ * @return true on success, false otherwise and errno is set appropriately.
  */
 bool xbps_match_string_in_array(xbps_array_t array, const char *val);
 
@@ -1249,7 +1249,7 @@ bool xbps_match_string_in_array(xbps_array_t array, const char *val);
  * @param[in] key Key associated with the array.
  *
  * @return A proplib object iterator on success, NULL otherwise and
- * errno is set appropiately.
+ * errno is set appropriately.
  */
 xbps_object_iterator_t xbps_array_iter_from_dict(xbps_dictionary_t dict, const char *key);
 
@@ -1274,7 +1274,7 @@ xbps_object_iterator_t xbps_array_iter_from_dict(xbps_dictionary_t dict, const c
  * @retval ENOENT Package not matched in repository pool.
  * @retval ENOTSUP No repositories are available.
  * @retval ENXIO Package depends on invalid dependencies.
- * @retval EINVAL Any other error ocurred in the process.
+ * @retval EINVAL Any other error occurred in the process.
  * @retval EBUSY The xbps package must be updated.
  */
 int xbps_transaction_install_pkg(struct xbps_handle *xhp, const char *pkg, bool force);
@@ -1298,7 +1298,7 @@ int xbps_transaction_install_pkg(struct xbps_handle *xhp, const char *pkg, bool
  * @retval ENOENT Package not matched in repository pool.
  * @retval ENOTSUP No repositories are available.
  * @retval ENXIO Package depends on invalid dependencies.
- * @retval EINVAL Any other error ocurred in the process.
+ * @retval EINVAL Any other error occurred in the process.
  * @retval EBUSY The xbps package must be updated.
  */
 int xbps_transaction_update_pkg(struct xbps_handle *xhp, const char *pkgname, bool force);
@@ -1315,7 +1315,7 @@ int xbps_transaction_update_pkg(struct xbps_handle *xhp, const char *pkgname, bo
  * @retval EEXIST All installed packages are already up-to-date.
  * @retval ENOENT No packages currently register.
  * @retval ENOTSUP No repositories currently installed.
- * @retval EINVAL Any other error ocurred in the process.
+ * @retval EINVAL Any other error occurred in the process.
  */
 int xbps_transaction_update_packages(struct xbps_handle *xhp);
 
@@ -1332,7 +1332,7 @@ int xbps_transaction_update_packages(struct xbps_handle *xhp);
  * @retval ENOENT Package is not installed.
  * @retval EEXIST Package has reverse dependencies.
  * @retval EINVAL
- * @retval ENXIO A problem ocurred in the process.
+ * @retval ENXIO A problem occurred in the process.
  */
 int xbps_transaction_remove_pkg(struct xbps_handle *xhp, const char *pkgname, bool recursive);
 
@@ -1345,7 +1345,7 @@ int xbps_transaction_remove_pkg(struct xbps_handle *xhp, const char *pkgname, bo
  * @retval 0 success.
  * @retval ENOENT No package orphans were found.
  * @retval ENXIO
- * @retval EINVAL A problem ocurred in the process.
+ * @retval EINVAL A problem occurred in the process.
  */
 int xbps_transaction_autoremove_pkgs(struct xbps_handle *xhp);
 
@@ -1445,7 +1445,7 @@ bool xbps_transaction_pkg_type_set(xbps_dictionary_t pkg_repod, xbps_trans_type_
  * @param[in] fname File name to match.
  *
  * @return A malloc(3)ed buffer with the contents of \a fname, NULL otherwise
- * and errno is set appropiately.
+ * and errno is set appropriately.
  */
 char *xbps_archive_fetch_file(const char *url, const char *fname);
 
@@ -1470,7 +1470,7 @@ int xbps_archive_fetch_file_into_fd(const char *url, const char *fname, int fd);
  * @param[in] p Proplist file name to internalize as a dictionary.
  *
  * @return An internalized proplib dictionary, otherwise NULL and
- * errno is set appropiately.
+ * errno is set appropriately.
  */
 xbps_dictionary_t xbps_archive_fetch_plist(const char *url, const char *p);
 
@@ -1628,7 +1628,7 @@ xbps_dictionary_t xbps_rpool_get_virtualpkg(struct xbps_handle *xhp, const char
  * @param[in] pkg Package expression to match in this repository index.
  *
  * @return The array of strings on success, NULL otherwise and errno is
- * set appropiately.
+ * set appropriately.
  */
 xbps_array_t xbps_rpool_get_pkg_revdeps(struct xbps_handle *xhp, const char *pkg);
 
@@ -1677,7 +1677,7 @@ bool xbps_repo_remove(struct xbps_handle *xhp, const char *url);
  * @param[out] lockfd Lock file descriptor assigned.
  * @param[out] lockfname Lock filename assigned.
  *
- * @return True on success and lockfd/lockfname are assigned appropiately.
+ * @return True on success and lockfd/lockfname are assigned appropriately.
  * otherwise false and lockfd/lockfname aren't set.
  */
 int xbps_repo_lock(const char *repodir, const char *arch);
@@ -1768,7 +1768,7 @@ xbps_dictionary_t xbps_repo_get_virtualpkg(struct xbps_repo *repo, const char *p
  * @param[in] pkg Package expression to match in this repository index.
  *
  * @return The array of strings on success, NULL otherwise and errno is
- * set appropiately.
+ * set appropriately.
  */
 xbps_array_t xbps_repo_get_pkg_revdeps(struct xbps_repo *repo, const char *pkg);
 
@@ -1915,7 +1915,7 @@ bool xbps_remove_string_from_array(xbps_array_t array, const char *str);
  * @param[in] path Path for final directory.
  * @param[in] mode Mode for final directory (0755 if not specified).
  *
- * @return 0 on success, -1 on error and errno set appropiately.
+ * @return 0 on success, -1 on error and errno set appropriately.
  */
 int xbps_mkpath(const char *path, mode_t mode);
 
@@ -1925,7 +1925,7 @@ int xbps_mkpath(const char *path, mode_t mode);
  *
  * @param[in] fmt Format string, see printf(3).
  * @return A pointer to a malloc(3)ed string, NULL otherwise and errno
- * is set appropiately. The pointer should be free(3)d when it's
+ * is set appropriately. The pointer should be free(3)d when it's
  * no longer needed.
  */
 char *xbps_xasprintf(const char *fmt, ...)__attribute__ ((format (printf, 1, 2)));
@@ -1940,7 +1940,7 @@ char *xbps_xasprintf(const char *fmt, ...)__attribute__ ((format (printf, 1, 2))
  * @param[out] filelen File size length.
  *
  * @return True on success, false otherwise and errno
- * is set appropiately. The mmaped object should be munmap()ed when it's
+ * is set appropriately. The mmap()ed object should be munmap()ed when it's
  * not longer needed.
  */
 bool xbps_mmap_file(const char *file, void **mmf, size_t *mmflen, size_t *filelen);
@@ -2013,7 +2013,7 @@ bool xbps_verify_file_signature(struct xbps_repo *repo, const char *fname);
  * @param[in] xhp The pointer to an xbps_handle struct.
  * @param[in] pkg Package name, version pattern or exact pkg to match.
  *
- * @return -1 on error (errno set appropiately), 0 if \a pkg
+ * @return -1 on error (errno set appropriately), 0 if \a pkg
  * didn't match installed package, 1 if \a pkg pattern fully
  * matched installed package.
  */
@@ -2172,7 +2172,7 @@ bool xbps_pkgpattern_name(char *dst, size_t len, const char *pattern);
 const char *xbps_pkg_version(const char *pkg);
 
 /**
- * Gets the pkgname/version componentn of a binary package string,
+ * Gets the pkgname/version component of a binary package string,
  * i.e `foo-2.0_1.<arch>.xbps`.
  *
  * @param[in] pkg Package string.
@@ -2203,7 +2203,7 @@ char *xbps_binpkg_arch(const char *pkg);
  * xbps_get_pkgpattern_name() apply here.
  *
  * @return A string with the pattern version, NULL otherwise and
- * errno is set appropiately.
+ * errno is set appropriately.
  */
 const char *xbps_pkgpattern_version(const char *pattern);
 
diff --git a/lib/package_configure.c b/lib/package_configure.c
index 4bb00817b..2525a0057 100644
--- a/lib/package_configure.c
+++ b/lib/package_configure.c
@@ -38,7 +38,7 @@
  * @defgroup configure Package configuration functions
  *
  * Configure a package or all packages. Only packages in XBPS_PKG_STATE_UNPACKED
- * state will be processed (unless overriden). Package configuration steps:
+ * state will be processed (unless overridden). Package configuration steps:
  *  - Its <b>post-install</b> target in the INSTALL script will be executed.
  *  - Its state will be changed to XBPS_PKG_STATE_INSTALLED if previous step
  *    ran successful.
diff --git a/lib/pubkey2fp.c b/lib/pubkey2fp.c
index 5b36cca44..b2a45b4aa 100644
--- a/lib/pubkey2fp.c
+++ b/lib/pubkey2fp.c
@@ -1,5 +1,5 @@
 /*
- * An implementation of convertion from OpenSSL to OpenSSH public key format
+ * An implementation of conversion from OpenSSL to OpenSSH public key format
  *
  * Copyright (c) 2008 Mounir IDRASSI <mounir.idrassi@idrix.fr>. All rights reserved.
  *
diff --git a/lib/repo.c b/lib/repo.c
index 302fb095d..57f3020d4 100644
--- a/lib/repo.c
+++ b/lib/repo.c
@@ -818,7 +818,7 @@ xbps_repo_key_import(struct xbps_repo *repo)
 		goto out;
 	}
 	/*
-	 * Check if the public key is alredy stored.
+	 * Check if the public key is already stored.
 	 */
 	rkeyfile = xbps_xasprintf("%s/keys/%s.plist", repo->xhp->metadir, hexfp);
 	repokeyd = xbps_plist_dictionary_from_file(rkeyfile);
@@ -827,7 +827,7 @@ xbps_repo_key_import(struct xbps_repo *repo)
 		goto out;
 	}
 	/*
-	 * Notify the client and take appropiate action to import
+	 * Notify the client and take appropriate action to import
 	 * the repository public key. Pass back the public key openssh fingerprint
 	 * to the client.
 	 */
diff --git a/lib/transaction_files.c b/lib/transaction_files.c
index ea2f5a304..cc4f0993f 100644
--- a/lib/transaction_files.c
+++ b/lib/transaction_files.c
@@ -112,7 +112,7 @@ addItem(const char *file)
 
 	/*
 	 * File paths are stored relative, but looked up absolute.
-	 * Skip the leading . (dot) and substract it from the length.
+	 * Skip the leading . (dot) and subtract it from the length.
 	 */
 	HASH_ADD_KEYPTR(hh, hashtab, item->file+1, item->len-1, item);
 
diff --git a/tests/xbps/libxbps/pkgdb/pkgdb-0.38.plist b/tests/xbps/libxbps/pkgdb/pkgdb-0.38.plist
index 7c4393ad0..8e82cfebe 100644
--- a/tests/xbps/libxbps/pkgdb/pkgdb-0.38.plist
+++ b/tests/xbps/libxbps/pkgdb/pkgdb-0.38.plist
@@ -13,7 +13,7 @@
 			<string>mixed-0.1_1</string>
 		</array>
 		<key>short_desc</key>
-		<string>four descriptionm</string>
+		<string>four description</string>
 		<key>state</key>
 		<string>installed</string>
 	</dict>
@@ -39,7 +39,7 @@
 			<string>two&gt;=0.2</string>
 		</array>
 		<key>short_desc</key>
-		<string>one descriptionm</string>
+		<string>one description</string>
 		<key>state</key>
 		<string>installed</string>
 	</dict>
@@ -54,7 +54,7 @@
 			<string>four-0.1_1</string>
 		</array>
 		<key>short_desc</key>
-		<string>three descriptionm</string>
+		<string>three description</string>
 		<key>state</key>
 		<string>installed</string>
 	</dict>
@@ -70,7 +70,7 @@
 			<string>mixed&gt;=0</string>
 		</array>
 		<key>short_desc</key>
-		<string>two descriptionm</string>
+		<string>two description</string>
 		<key>state</key>
 		<string>installed</string>
 	</dict>
@@ -106,7 +106,7 @@
 			<string>0.4_1</string>
 		</array>
 		<key>short_desc</key>
-		<string>two descriptionm</string>
+		<string>two description</string>
 		<key>state</key>
 		<string>installed</string>
 	</dict>
diff --git a/tests/xbps/libxbps/shell/cyclic_deps_test.sh b/tests/xbps/libxbps/shell/cyclic_deps_test.sh
index 0a1474e97..f0cbaafeb 100644
--- a/tests/xbps/libxbps/shell/cyclic_deps_test.sh
+++ b/tests/xbps/libxbps/shell/cyclic_deps_test.sh
@@ -105,7 +105,7 @@ cyclic_dep_full_body() {
 atf_test_case cyclic_dep_of_dep
 
 cyclic_dep_of_dep_head() {
-	atf_set "descr" "Tests for cyclic deps: installing cylic deps directly and indirectly"
+	atf_set "descr" "Tests for cyclic deps: installing cyclic deps directly and indirectly"
 }
 
 cyclic_dep_of_dep_body() {
@@ -136,7 +136,7 @@ cyclic_dep_of_dep_body() {
 atf_test_case cyclic_dep_update
 
 cyclic_dep_update_head() {
-	atf_set "descr" "Tests for cyclic deps: test cylic deps during updates"
+	atf_set "descr" "Tests for cyclic deps: test cyclic deps during updates"
 }
 
 cyclic_dep_update_body() {
@@ -198,7 +198,7 @@ cyclic_dep_update_body() {
 		-o match:"systemd-2\.0_1 update" \
 		-- xbps-install -r root -R repo -n -u systemd
 		# XXX: xbps automatically updates revdeps...
-		# -o not-match:"base-system-3\.0_1 update" 
+		# -o not-match:"base-system-3\.0_1 update"
 
 	atf_check \
 		-o match:"base-system-3\.0_1 update" \
diff --git a/tests/xbps/xbps-fetch/fetch_test.sh b/tests/xbps/xbps-fetch/fetch_test.sh
index c9c577519..3a4b53500 100755
--- a/tests/xbps/xbps-fetch/fetch_test.sh
+++ b/tests/xbps/xbps-fetch/fetch_test.sh
@@ -21,7 +21,7 @@ pkgnotfound_head() {
 }
 
 pkgnotfound_body() {
-	xbps-fetch file://$PWD/nonexistant
+	xbps-fetch file://$PWD/nonexistent
 	atf_check_equal $? 1
 }
 
@@ -66,11 +66,11 @@ multiple_notfound_head() {
 multiple_notfound_body() {
 	mkdir some_repo
 	touch some_repo/pkg_A
-	xbps-fetch file://$PWD/some_repo/nonexistant file://$PWD/some_repo/pkg_A
+	xbps-fetch file://$PWD/some_repo/nonexistent file://$PWD/some_repo/pkg_A
 	atf_check_equal $? 1
 	test -f pkg_A
 	atf_check_equal $? 0
-	test -f nonexistant
+	test -f nonexistent
 	atf_check_equal $? 1
 }
 
diff --git a/tests/xbps/xbps-remove/basic_test.sh b/tests/xbps/xbps-remove/basic_test.sh
index bbfc02419..2f0823536 100755
--- a/tests/xbps/xbps-remove/basic_test.sh
+++ b/tests/xbps/xbps-remove/basic_test.sh
@@ -203,7 +203,7 @@ clean_cache_installed_body() {
 atf_test_case remove_msg
 
 remove_msg_head() {
-	atf_set "descr" "xbps-rmeove(1): show remove message"
+	atf_set "descr" "xbps-remove(1): show remove message"
 }
 
 remove_msg_body() {