diff --git a/Makefile.am b/Makefile.am
index dbad2ef74..d4bff6e55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,33 +21,33 @@ aten_DATA = src/gui/icons/aten.png
 
 testroot = $(atendir)/test
 test01dir = $(testroot)/build
-test01_DATA = $(testroot)/build/*
+test01_DATA = data/test/build/*
 test02dir = $(testroot)/ff
-test02_DATA = $(testroot)/ff/*
+test02_DATA = data/test/ff/*
 test03dir = $(testroot)/forces
-test03_DATA = $(testroot)/forces/*
+test03_DATA = data/test/forces/*
 test04dir = $(testroot)/io_cif
-test04_DATA = $(testroot)/io_cif/*
+test04_DATA = data/test/io_cif/*
 test05dir = $(testroot)/io_csd
-test05_DATA = $(testroot)/io_csd/*
+test05_DATA = data/test/io_csd/*
 test06dir = $(testroot)/io_dlputils
-test06_DATA = $(testroot)/io_dlputils/*
+test06_DATA = data/test/io_dlputils/*
 test07dir = $(testroot)/io_epsr
-test07_DATA = $(testroot)/io_epsr/*
+test07_DATA = data/test/io_epsr/*
 test08dir = $(testroot)/io_gamess
-test08_DATA = $(testroot)/io_gamess/*
+test08_DATA = data/test/io_gamess/*
 test09dir = $(testroot)/io_msi
-test09_DATA = $(testroot)/io_msi/*
+test09_DATA = data/test/io_msi/*
 test10dir = $(testroot)/io_pdb
-test10_DATA = $(testroot)/io_pdb/*
+test10_DATA = data/test/io_pdb/*
 test11dir = $(testroot)/io_sybylmol2
-test11_DATA = $(testroot)/io_sybylmol2/*
+test11_DATA = data/test/io_sybylmol2/*
 test12dir = $(testroot)/io_xyz
-test12_DATA = $(testroot)/io_xyz/*
+test12_DATA = data/test/io_xyz/*
 test13dir = $(testroot)/render
-test13_DATA = $(testroot)/render/*
+test13_DATA = data/test/render/*
 test14dir = $(testroot)/typing
-test14_DATA = $(testroot)/typing/*
+test14_DATA = data/test/typing/*
 
 ffdir = $(atendir)/ff
 ff_DATA = data/ff/*