diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 73dda5fe8..3cb28d13b 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -31,11 +31,11 @@
 # find tests -name '*.cpp' -a ! -wholename '*/not-unit/*' -printf '\t%p\n' | sort
 list (APPEND TEST_SOURCE_FILES
 	tests/test_fluidmatrixinteractions.cpp
-	tests/material/pengrobinson/test_pengrobinson.cpp
-	tests/material/ncpflash/test_ncpflash.cpp
-	tests/material/tabulation/test_tabulation.cpp
-	tests/material/fluidsystems/test_fluidsystems.cpp
-	tests/material/immiscibleflash/test_immiscibleflash.cpp
+	tests/test_pengrobinson.cpp
+	tests/test_ncpflash.cpp
+	tests/test_tabulation.cpp
+	tests/test_fluidsystems.cpp
+	tests/test_immiscibleflash.cpp
 	)
 
 # originally generated with the command:
diff --git a/tests/material/fluidsystems/checkFluidSystem.hpp b/tests/checkFluidSystem.hpp
similarity index 100%
rename from tests/material/fluidsystems/checkFluidSystem.hpp
rename to tests/checkFluidSystem.hpp
diff --git a/tests/material/fluidsystems/test_fluidsystems.cpp b/tests/test_fluidsystems.cpp
similarity index 100%
rename from tests/material/fluidsystems/test_fluidsystems.cpp
rename to tests/test_fluidsystems.cpp
diff --git a/tests/material/immiscibleflash/test_immiscibleflash.cpp b/tests/test_immiscibleflash.cpp
similarity index 100%
rename from tests/material/immiscibleflash/test_immiscibleflash.cpp
rename to tests/test_immiscibleflash.cpp
diff --git a/tests/material/ncpflash/test_ncpflash.cpp b/tests/test_ncpflash.cpp
similarity index 100%
rename from tests/material/ncpflash/test_ncpflash.cpp
rename to tests/test_ncpflash.cpp
diff --git a/tests/material/pengrobinson/test_pengrobinson.cpp b/tests/test_pengrobinson.cpp
similarity index 100%
rename from tests/material/pengrobinson/test_pengrobinson.cpp
rename to tests/test_pengrobinson.cpp
diff --git a/tests/material/tabulation/test_tabulation.cpp b/tests/test_tabulation.cpp
similarity index 100%
rename from tests/material/tabulation/test_tabulation.cpp
rename to tests/test_tabulation.cpp