diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 3f236c9234..b5d6d5c5ca 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -19,14 +19,16 @@ bin_PROGRAMS = tex2lyx
 
 DEFAULT_INCLUDES = 
 
-AM_CPPFLAGS += \
-	-DTEX2LYX \
-	$(PCH_FLAGS) \
-	-I$(top_srcdir)/src/tex2lyx \
-	-I$(top_srcdir)/src  \
-	-I$(top_builddir) \
-	$(BOOST_INCLUDES)
+AM_CPPFLAGS += -DTEX2LYX $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
+	-I$(top_srcdir)/src -I$(top_builddir) $(BOOST_INCLUDES)
 
+TEST_FILES = \
+	test/box-color-size-space-align.tex \
+	test/foo.eps \
+	test/foo.png \
+	test/test-insets.tex \
+	test/test.ltx \
+	test/test-structure.tex
 
 LINKED_FILES = \
 	../FloatList.cpp \
diff --git a/src/tex2lyx/box-color-size-space-align.tex b/src/tex2lyx/test/box-color-size-space-align.tex
similarity index 100%
rename from src/tex2lyx/box-color-size-space-align.tex
rename to src/tex2lyx/test/box-color-size-space-align.tex
diff --git a/src/tex2lyx/foo.eps b/src/tex2lyx/test/foo.eps
similarity index 100%
rename from src/tex2lyx/foo.eps
rename to src/tex2lyx/test/foo.eps
diff --git a/src/tex2lyx/foo.png b/src/tex2lyx/test/foo.png
similarity index 100%
rename from src/tex2lyx/foo.png
rename to src/tex2lyx/test/foo.png
diff --git a/src/tex2lyx/test-insets.tex b/src/tex2lyx/test/test-insets.tex
similarity index 100%
rename from src/tex2lyx/test-insets.tex
rename to src/tex2lyx/test/test-insets.tex
diff --git a/src/tex2lyx/test-structure.tex b/src/tex2lyx/test/test-structure.tex
similarity index 100%
rename from src/tex2lyx/test-structure.tex
rename to src/tex2lyx/test/test-structure.tex
diff --git a/src/tex2lyx/test.ltx b/src/tex2lyx/test/test.ltx
similarity index 100%
rename from src/tex2lyx/test.ltx
rename to src/tex2lyx/test/test.ltx