diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e8800dd..ac4c56c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,35 +1,35 @@
 
 # the test executables require ROOT for histogramming etc.
 find_package(ROOT QUIET COMPONENTS Hist)
 if (ROOT_FOUND)
     add_library(root_interface INTERFACE IMPORTED)
     target_include_directories(root_interface INTERFACE ${ROOT_INCLUDE_DIRS})
     target_link_libraries(root_interface INTERFACE ${ROOT_LIBRARIES})
 
     # build each of the executables
     foreach( test_exe evt_dalitz evtgenlhc_test1 example1 exampleWriteHepMC )
         add_executable(${test_exe} ${test_exe}.cc)
         target_link_libraries(${test_exe} PRIVATE EvtGen)
         if (EVTGEN_HEPMC3)
             target_compile_definitions(${test_exe} PRIVATE EVTGEN_HEPMC3)
         endif()
         if( EVTGEN_PYTHIA OR EVTGEN_PHOTOS OR EVTGEN_TAUOLA )
             target_compile_definitions(${test_exe} PRIVATE EVTGEN_EXTERNAL)
             target_link_libraries(${test_exe} PRIVATE EvtGenExternal)
         endif()
         target_link_libraries(${test_exe} PRIVATE root_interface)
     endforeach()
 
     # install the executables
     install(TARGETS evt_dalitz evtgenlhc_test1 example1 exampleWriteHepMC
-        RUNTIME DESTINATION test
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/test
         )
 
     # install the decay files, macros, scripts, etc.
-    install(DIRECTORY exampleFiles DESTINATION ${CMAKE_INSTALL_PREFIX}/test)
+    install(DIRECTORY exampleFiles DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/test)
     install(FILES do_tests
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/test
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/test
         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 else()
     message(WARNING "Could not find ROOT, cannot build test executables")
 endif()
diff --git a/validation/CMakeLists.txt b/validation/CMakeLists.txt
index f8c327e..0d2043e 100644
--- a/validation/CMakeLists.txt
+++ b/validation/CMakeLists.txt
@@ -1,65 +1,65 @@
 
 # the validation executables require ROOT for histogramming etc.
 find_package(ROOT QUIET COMPONENTS Hist)
 if (ROOT_FOUND)
     add_library(root_interface INTERFACE IMPORTED)
     target_include_directories(root_interface INTERFACE ${ROOT_INCLUDE_DIRS})
     target_link_libraries(root_interface INTERFACE ${ROOT_LIBRARIES})
 
     # build each of the executables
     foreach( validation_exe compareRootFiles genExampleRootFiles genRootDecayChain testCPVDecays )
         add_executable(${validation_exe} ${validation_exe}.cc)
         target_link_libraries(${validation_exe} PRIVATE EvtGen)
         if (EVTGEN_HEPMC3)
-            target_compile_definitions(${test_exe} PRIVATE EVTGEN_HEPMC3)
+            target_compile_definitions(${validation_exe} PRIVATE EVTGEN_HEPMC3)
         endif()
         if( EVTGEN_PYTHIA OR EVTGEN_PHOTOS OR EVTGEN_TAUOLA )
             target_compile_definitions(${validation_exe} PRIVATE EVTGEN_EXTERNAL)
             target_link_libraries(${validation_exe} PRIVATE EvtGenExternal)
         endif()
         target_link_libraries(${validation_exe} PRIVATE root_interface)
     endforeach()
 
     # install the executables
     install(TARGETS compareRootFiles genExampleRootFiles genRootDecayChain testCPVDecays
-        RUNTIME DESTINATION validation
+        RUNTIME DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation
         )
 
     # install the decay files, macros, scripts, etc.
-    install(DIRECTORY B0Files DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(DIRECTORY CPVDecayFiles DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(DIRECTORY UpsilonFiles DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(DIRECTORY TauolaFiles DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(DIRECTORY Bs0Files DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(DIRECTORY tauFiles DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(DIRECTORY rootFiles DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(DIRECTORY PHSPFiles DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(DIRECTORY BpFiles DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(DIRECTORY gifFiles DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(DIRECTORY DalitzFiles DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(FILES BKstarGamma.dec BuDst0rhop.dec Kspimumu.dec photosTest.dec DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
-    install(FILES compareDalitz.C PhaseSpacePlots.C photosPlots.C plotBKstarGamma.C PlotKspimumu.C DESTINATION ${CMAKE_INSTALL_PREFIX}/validation)
+    install(DIRECTORY B0Files DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(DIRECTORY CPVDecayFiles DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(DIRECTORY UpsilonFiles DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(DIRECTORY TauolaFiles DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(DIRECTORY Bs0Files DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(DIRECTORY tauFiles DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(DIRECTORY rootFiles DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(DIRECTORY PHSPFiles DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(DIRECTORY BpFiles DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(DIRECTORY gifFiles DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(DIRECTORY DalitzFiles DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(FILES BKstarGamma.dec BuDst0rhop.dec Kspimumu.dec photosTest.dec DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
+    install(FILES compareDalitz.C PhaseSpacePlots.C photosPlots.C plotBKstarGamma.C PlotKspimumu.C DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation)
     install(FILES compareAllDecays.sh
         compareB0PythiaDecays.sh
         compareBpPythiaDecays.sh
         compareBs0PythiaDecays.sh
         compareTauolaDecays.sh
         compareTauPythiaDecays.sh
         compareUpsilonPythiaDecays.sh
         genAllDecayExamples.sh
         genB0PythiaDecays.sh
         genBpPythiaDecays.sh
         genBs0PythiaDecays.sh
         genDalitzDecays.sh
         genDDalitzModes.sh
         genPHSP.sh
         genTauolaDecays.sh
         genTauPythiaDecays.sh
         genUpsilonPythiaDecays.sh
         runKspimumu.sh
         runPhotosTest.sh
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/validation
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/EvtGen/validation
         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 else()
     message(WARNING "Could not find ROOT, cannot build validation executables")
 endif()