diff --git a/src/common/include.am b/src/common/include.am
index 3b49220cec..29bbdd7696 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -94,7 +94,6 @@ COMMONHEADERS = \
   src/common/procmon.h				\
   src/common/sandbox.h				\
   src/common/storagedir.h			\
-  src/common/testsupport.h			\
   src/common/timers.h				\
   src/common/token_bucket.h			\
   src/common/torlog.h				\
diff --git a/src/include.am b/src/include.am
index 685fe34337..c70a681887 100644
--- a/src/include.am
+++ b/src/include.am
@@ -5,6 +5,7 @@ include src/lib/ctime/include.am
 include src/lib/compress/include.am
 include src/lib/crypt_ops/include.am
 include src/lib/include.libdonna.am
+include src/lib/testsupport/include.am
 include src/lib/tls/include.am
 include src/lib/trace/include.am
 include src/common/include.am
diff --git a/src/lib/testsupport/include.am b/src/lib/testsupport/include.am
new file mode 100644
index 0000000000..b2aa620985
--- /dev/null
+++ b/src/lib/testsupport/include.am
@@ -0,0 +1,3 @@
+
+noinst_HEADERS += \
+	src/lib/testsupport/testsupport.h
diff --git a/src/common/testsupport.h b/src/lib/testsupport/testsupport.h
similarity index 100%
rename from src/common/testsupport.h
rename to src/lib/testsupport/testsupport.h