diff --git a/src/Makefile.am b/src/Makefile.am
index 81c40e45a89a0e5cefeb9306bc5d582320a4add6..b2c2ca6187e702593513ebc704e54e40bc6526aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,7 +104,7 @@ REMOTE_DRIVER_SOURCES =						\
 
 # Mock driver, covering domains, storage, networks, etc
 TEST_DRIVER_SOURCES =						\
-		test.c test.h
+		test/test_driver.c test/test_driver.h
 
 
 
diff --git a/src/libvirt.c b/src/libvirt.c
index 6a0fb00a64c7d1b8b45cc999c3299b788d6da8bf..98f17ffc985a2f6b457f1e571f025cd1f257b20a 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -44,7 +44,7 @@
 
 #ifndef WITH_DRIVER_MODULES
 #ifdef WITH_TEST
-#include "test.h"
+#include "test/test_driver.h"
 #endif
 #ifdef WITH_XEN
 #include "xen/xen_driver.h"
diff --git a/src/test.c b/src/test/test_driver.c
similarity index 99%
rename from src/test.c
rename to src/test/test_driver.c
index 368a3cbfcc84ac3128dcbb31a09d761c9ab1e33c..778992c68cbe0f855636b3a5510af5289d0087ef 100644
--- a/src/test.c
+++ b/src/test/test_driver.c
@@ -34,7 +34,7 @@
 
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "test.h"
+#include "test_driver.h"
 #include "buf.h"
 #include "util.h"
 #include "uuid.h"
diff --git a/src/test.h b/src/test/test_driver.h
similarity index 100%
rename from src/test.h
rename to src/test/test_driver.h