diff --git a/test/Makefile.am b/test/Makefile.am
index 4e69969..7c09b1c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,13 +1,11 @@
 AM_CPPFLAGS = -I$(top_srcdir)
 
-check_PROGRAMS =
-
 TESTS = $(check_PROGRAMS)
 
-check_PROGRAMS += store_test
+check_PROGRAMS = store_test
 store_test_SOURCES = store/store.cpp
 
-check_PROGRAMS += parser_test
+noinst_PROGRAMS = parser_test
 parser_test_SOURCES = \
 	parser/parser.cpp \
 	../impl.cpp \
diff --git a/test/test.vpd b/test/parser/test.vpd
similarity index 100%
rename from test/test.vpd
rename to test/parser/test.vpd
Binary files differ