14 files changed, 13 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index 13e1af6776..829db7e9ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -824,7 +824,7 @@ systemd_LDADD = \
 
 # ------------------------------------------------------------------------------
 test_engine_SOURCES = \
-	test/test-engine.c
+	src/test/test-engine.c
 
 test_engine_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -835,7 +835,7 @@ test_engine_LDADD = \
 	libsystemd-daemon.la
 
 test_job_type_SOURCES = \
-	test/test-job-type.c
+	src/test/test-job-type.c
 
 test_job_type_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -845,51 +845,51 @@ test_job_type_LDADD = \
 	libsystemd-core.la
 
 test_ns_SOURCES = \
-	test/test-ns.c
+	src/test/test-ns.c
 
 test_ns_LDADD = \
 	libsystemd-core.la
 
 test_loopback_SOURCES = \
-	test/test-loopback.c
+	src/test/test-loopback.c
 
 test_loopback_LDADD = \
 	libsystemd-shared.la
 
 test_hostname_SOURCES = \
-	test/test-hostname.c
+	src/test/test-hostname.c
 
 test_hostname_LDADD = \
 	libsystemd-shared.la
 
 test_daemon_SOURCES = \
-	test/test-daemon.c
+	src/test/test-daemon.c
 
 test_daemon_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
-	test/test-cgroup.c
+	src/test/test-cgroup.c
 
 test_cgroup_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
 test_env_replace_SOURCES = \
-	test/test-env-replace.c
+	src/test/test-env-replace.c
 
 test_env_replace_LDADD = \
 	libsystemd-shared.la
 
 test_strv_SOURCES = \
-	test/test-strv.c
+	src/test/test-strv.c
 
 test_strv_LDADD = \
 	libsystemd-shared.la
 
 test_install_SOURCES = \
-	test/test-install.c
+	src/test/test-install.c
 
 test_install_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -900,7 +900,7 @@ test_install_LDADD = \
 	libsystemd-shared.la
 
 test_watchdog_SOURCES = \
-	test/test-watchdog.c
+	src/test/test-watchdog.c
 
 test_watchdog_LDADD = \
 	libsystemd-shared.la
@@ -1861,7 +1861,7 @@ libsystemd_id128_la_LIBADD = \
 	libsystemd-shared.la
 
 test_id128_SOURCES = \
-	test/test-id128.c
+	src/test/test-id128.c
 
 test_id128_LDADD = \
 	libsystemd-shared.la \
diff --git a/src/test/Makefile b/src/test/Makefile
new file mode 120000
index 0000000000..d0b0e8e008
--- /dev/null
+++ b/src/test/Makefile
@@ -0,0 +1 @@
+../Makefile
+\ No newline at end of file
diff --git a/test/test-cgroup.c b/src/test/test-cgroup.c
index e742632032..e742632032 100644
--- a/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
diff --git a/test/test-daemon.c b/src/test/test-daemon.c
index 3215f0c560..3215f0c560 100644
--- a/test/test-daemon.c
+++ b/src/test/test-daemon.c
diff --git a/test/test-engine.c b/src/test/test-engine.c
index 11389a5ac7..11389a5ac7 100644
--- a/test/test-engine.c
+++ b/src/test/test-engine.c
diff --git a/test/test-env-replace.c b/src/test/test-env-replace.c
index 4b6b884779..4b6b884779 100644
--- a/test/test-env-replace.c
+++ b/src/test/test-env-replace.c
diff --git a/test/test-hostname.c b/src/test/test-hostname.c
index 8c1a60f940..8c1a60f940 100644
--- a/test/test-hostname.c
+++ b/src/test/test-hostname.c
diff --git a/test/test-id128.c b/src/test/test-id128.c
index bfd743eca3..bfd743eca3 100644
--- a/test/test-id128.c
+++ b/src/test/test-id128.c
diff --git a/test/test-install.c b/src/test/test-install.c
index 709974f9e5..709974f9e5 100644
--- a/test/test-install.c
+++ b/src/test/test-install.c
diff --git a/test/test-job-type.c b/src/test/test-job-type.c
index ba8b307dd3..ba8b307dd3 100644
--- a/test/test-job-type.c
+++ b/src/test/test-job-type.c
diff --git a/test/test-loopback.c b/src/test/test-loopback.c
index ab330ac840..ab330ac840 100644
--- a/test/test-loopback.c
+++ b/src/test/test-loopback.c
diff --git a/test/test-ns.c b/src/test/test-ns.c
index 102b005880..102b005880 100644
--- a/test/test-ns.c
+++ b/src/test/test-ns.c
diff --git a/test/test-strv.c b/src/test/test-strv.c
index 5ee4447669..5ee4447669 100644
--- a/test/test-strv.c
+++ b/src/test/test-strv.c
diff --git a/test/test-watchdog.c b/src/test/test-watchdog.c
index ccb1854708..ccb1854708 100644
--- a/test/test-watchdog.c
+++ b/src/test/test-watchdog.c