diff --git a/Makefile.am b/Makefile.am
index cc4d046f..3a3776ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,8 +112,8 @@ git_include = src/gitversion.h
 pgp_sources = \
 	src/pgp/gpg.h src/pgp/gpg.c
 
-pgp_test_sources = \
-	tests/pgp/stub_gpg.c
+pgp_unittest_sources = \
+	unittests/pgp/stub_gpg.c
 
 otr3_sources = \
 	src/otr/otrlib.h src/otr/otrlibv3.c src/otr/otr.h src/otr/otr.c
@@ -132,7 +132,7 @@ man_sources = docs/profanity.1
 
 if BUILD_PGP
 core_sources += $(pgp_sources)
-unittest_sources += $(pgp_test_sources)
+unittest_sources += $(pgp_unittest_sources)
 endif
 
 if BUILD_OTR
diff --git a/tests/pgp/stub_gpg.c b/unittests/pgp/stub_gpg.c
similarity index 100%
rename from tests/pgp/stub_gpg.c
rename to unittests/pgp/stub_gpg.c