diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index eb0142359..2a9b2164d 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -382,17 +382,12 @@ if(ENABLE_ECL_OUTPUT)
 endif()
 
 list (APPEND TEST_SOURCE_FILES
-      tests/test_2dtables.cpp
-      tests/test_blackoilfluidstate.cpp
       tests/test_calculateCellVol.cpp
       tests/test_cmp.cpp
-      tests/test_components.cpp
       tests/test_ConditionalStorage.cpp
       tests/test_cubic.cpp
       tests/test_EvaluationFormat.cpp
       tests/test_densead.cpp
-      tests/test_fluidmatrixinteractions.cpp
-      tests/test_fluidsystems.cpp
       tests/test_messagelimiter.cpp
       tests/test_nonuniformtablelinear.cpp
       tests/test_OpmInputError_format.cpp
@@ -401,29 +396,30 @@ list (APPEND TEST_SOURCE_FILES
       tests/test_RootFinders.cpp
       tests/test_SegmentMatcher.cpp
       tests/test_sparsevector.cpp
-      tests/test_spline.cpp
-      tests/test_tabulation.cpp
       tests/test_uniformtablelinear.cpp
+      tests/material/test_2dtables.cpp
+      tests/material/test_blackoilfluidstate.cpp
+      tests/material/test_components.cpp
+      tests/material/test_fluidmatrixinteractions.cpp
+      tests/material/test_fluidsystems.cpp
+      tests/material/test_spline.cpp
+      tests/material/test_tabulation.cpp
 )
 
 # tests that need to be linked to dune-common
 list(APPEND DUNE_TEST_SOURCE_FILES
-      tests/test_co2brine_ptflash.cpp
-      tests/test_immiscibleflash.cpp
-      tests/test_ncpflash.cpp
-      tests/test_pengrobinson.cpp
-      tests/test_threecomponents_ptflash.cpp
+      tests/material/test_co2brine_ptflash.cpp
+      tests/material/test_immiscibleflash.cpp
+      tests/material/test_ncpflash.cpp
+      tests/material/test_pengrobinson.cpp
+      tests/material/test_threecomponents_ptflash.cpp
 )
 
 if(ENABLE_ECL_INPUT)
   list(APPEND TEST_SOURCE_FILES
     tests/rst_test.cpp
     tests/test_ActiveGridCells.cpp
-    tests/test_co2brinepvt.cpp
     tests/test_CopyablePtr.cpp
-    tests/test_eclblackoilfluidsystem.cpp
-    tests/test_eclblackoilpvt.cpp
-    tests/test_eclmateriallawmanager.cpp
     tests/test_ERsm.cpp
     tests/test_GuideRate.cpp
     tests/test_RestartFileView.cpp
@@ -435,6 +431,10 @@ if(ENABLE_ECL_INPUT)
     tests/test_EInit.cpp
     tests/test_ExtESmry.cpp
     tests/test_Serialization.cpp
+    tests/material/test_co2brinepvt.cpp
+    tests/material/test_eclblackoilfluidsystem.cpp
+    tests/material/test_eclblackoilpvt.cpp
+    tests/material/test_eclmateriallawmanager.cpp
     tests/parser/ACTIONX.cpp
     tests/parser/ADDREGTests.cpp
     tests/parser/AquiferTests.cpp
diff --git a/tests/checkComponent.hpp b/tests/material/checkComponent.hpp
similarity index 100%
rename from tests/checkComponent.hpp
rename to tests/material/checkComponent.hpp
diff --git a/tests/test_2dtables.cpp b/tests/material/test_2dtables.cpp
similarity index 100%
rename from tests/test_2dtables.cpp
rename to tests/material/test_2dtables.cpp
diff --git a/tests/test_blackoilfluidstate.cpp b/tests/material/test_blackoilfluidstate.cpp
similarity index 100%
rename from tests/test_blackoilfluidstate.cpp
rename to tests/material/test_blackoilfluidstate.cpp
diff --git a/tests/test_co2brine_ptflash.cpp b/tests/material/test_co2brine_ptflash.cpp
similarity index 100%
rename from tests/test_co2brine_ptflash.cpp
rename to tests/material/test_co2brine_ptflash.cpp
diff --git a/tests/test_co2brinepvt.cpp b/tests/material/test_co2brinepvt.cpp
similarity index 100%
rename from tests/test_co2brinepvt.cpp
rename to tests/material/test_co2brinepvt.cpp
diff --git a/tests/test_components.cpp b/tests/material/test_components.cpp
similarity index 100%
rename from tests/test_components.cpp
rename to tests/material/test_components.cpp
diff --git a/tests/test_eclblackoilfluidsystem.cpp b/tests/material/test_eclblackoilfluidsystem.cpp
similarity index 100%
rename from tests/test_eclblackoilfluidsystem.cpp
rename to tests/material/test_eclblackoilfluidsystem.cpp
diff --git a/tests/test_eclblackoilpvt.cpp b/tests/material/test_eclblackoilpvt.cpp
similarity index 100%
rename from tests/test_eclblackoilpvt.cpp
rename to tests/material/test_eclblackoilpvt.cpp
diff --git a/tests/test_eclmateriallawmanager.cpp b/tests/material/test_eclmateriallawmanager.cpp
similarity index 100%
rename from tests/test_eclmateriallawmanager.cpp
rename to tests/material/test_eclmateriallawmanager.cpp
diff --git a/tests/test_fluidmatrixinteractions.cpp b/tests/material/test_fluidmatrixinteractions.cpp
similarity index 100%
rename from tests/test_fluidmatrixinteractions.cpp
rename to tests/material/test_fluidmatrixinteractions.cpp
diff --git a/tests/test_fluidsystems.cpp b/tests/material/test_fluidsystems.cpp
similarity index 100%
rename from tests/test_fluidsystems.cpp
rename to tests/material/test_fluidsystems.cpp
diff --git a/tests/test_immiscibleflash.cpp b/tests/material/test_immiscibleflash.cpp
similarity index 100%
rename from tests/test_immiscibleflash.cpp
rename to tests/material/test_immiscibleflash.cpp
diff --git a/tests/test_ncpflash.cpp b/tests/material/test_ncpflash.cpp
similarity index 100%
rename from tests/test_ncpflash.cpp
rename to tests/material/test_ncpflash.cpp
diff --git a/tests/test_pengrobinson.cpp b/tests/material/test_pengrobinson.cpp
similarity index 100%
rename from tests/test_pengrobinson.cpp
rename to tests/material/test_pengrobinson.cpp
diff --git a/tests/test_spline.cpp b/tests/material/test_spline.cpp
similarity index 100%
rename from tests/test_spline.cpp
rename to tests/material/test_spline.cpp
diff --git a/tests/test_tabulation.cpp b/tests/material/test_tabulation.cpp
similarity index 100%
rename from tests/test_tabulation.cpp
rename to tests/material/test_tabulation.cpp
diff --git a/tests/test_threecomponents_ptflash.cpp b/tests/material/test_threecomponents_ptflash.cpp
similarity index 100%
rename from tests/test_threecomponents_ptflash.cpp
rename to tests/material/test_threecomponents_ptflash.cpp