diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9607fcb0..4e8d9e92 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,5 +21,11 @@ libintel_tools_la_SOURCES = 	\
 	intel_mmio.c		\
 	intel_pci.c		\
 	intel_reg.h		\
-	intel_reg_map.c
+	gem_stress_i915.c	\
+	gem_stress_i830.c	\
+	gen6_render.h		\
+	gem_stress_gen6.c	\
+	intel_reg_map.c		\
+	gem_stress.h		\
+	$(NULL)
 
diff --git a/tests/gem_stress_gen6.c b/lib/gem_stress_gen6.c
similarity index 100%
rename from tests/gem_stress_gen6.c
rename to lib/gem_stress_gen6.c
diff --git a/tests/gem_stress_i830.c b/lib/gem_stress_i830.c
similarity index 100%
rename from tests/gem_stress_i830.c
rename to lib/gem_stress_i830.c
diff --git a/tests/gem_stress_i915.c b/lib/gem_stress_i915.c
similarity index 100%
rename from tests/gem_stress_i915.c
rename to lib/gem_stress_i915.c
diff --git a/tests/gen6_render.h b/lib/gen6_render.h
similarity index 100%
rename from tests/gen6_render.h
rename to lib/gen6_render.h
diff --git a/tests/rendercopy.h b/lib/rendercopy.h
similarity index 100%
rename from tests/rendercopy.h
rename to lib/rendercopy.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 190d2d35..bb2581bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,15 +4,6 @@ noinst_PROGRAMS = \
 	$(HANG) \
 	$(NULL)
 
-gem_stress_SOURCES = \
-	gem_stress.c \
-	gem_stress.h \
-	gem_stress_i915.c \
-	gem_stress_i830.c \
-	gen6_render.h \
-	gem_stress_gen6.c \
-	$(NULL)
-
 TESTS_progs = \
 	getversion \
 	getclient \