diff --git a/test/material/fluidmatrixinteractions/2p/test_thermalconductivityjohansen.input b/test/material/fluidmatrixinteractions/2p/test_thermalconductivityjohansen.input
index 4848725a60bf680c98045b0f1c2e0f5310167879..8591d374e3a27dd441887b4766ba5fe7f5c33eb1 100644
--- a/test/material/fluidmatrixinteractions/2p/test_thermalconductivityjohansen.input
+++ b/test/material/fluidmatrixinteractions/2p/test_thermalconductivityjohansen.input
@@ -3,7 +3,7 @@ DtInitial = 1 # [s]
 TEnd = 2 # [s]
 
 [Grid]
-File = ../../../implicit/2p/grids/test_2p.dgf
+File = ../../../porousmediumflow/2p/implicit/grids/test_2p.dgf
 
 [Conductivity]
-File = johansen
\ No newline at end of file
+File = johansen
diff --git a/test/material/fluidmatrixinteractions/2p/test_thermalconductivitysomerton.input b/test/material/fluidmatrixinteractions/2p/test_thermalconductivitysomerton.input
index 5b58154da104f68261842d4ce76504266489b6c4..8ec5d4c3ba58c8a1574555606d3414bd86e09ebc 100644
--- a/test/material/fluidmatrixinteractions/2p/test_thermalconductivitysomerton.input
+++ b/test/material/fluidmatrixinteractions/2p/test_thermalconductivitysomerton.input
@@ -3,7 +3,7 @@ DtInitial = 1 # [s]
 TEnd = 2 # [s]
 
 [Grid]
-File = ../../../implicit/2p/grids/test_2p.dgf
+File = ../../../porousmediumflow/2p/implicit/grids/test_2p.dgf
 
 [Conductivity]
-File = somerton
\ No newline at end of file
+File = somerton
diff --git a/test/material/fluidmatrixinteractions/test_effectivediffusivityconstanttau.input b/test/material/fluidmatrixinteractions/test_effectivediffusivityconstanttau.input
index 5792a25e18f86acdc1b142eddab0cb98eba3b183..70574850e7e53155cca15a288f0c302e65f6be41 100644
--- a/test/material/fluidmatrixinteractions/test_effectivediffusivityconstanttau.input
+++ b/test/material/fluidmatrixinteractions/test_effectivediffusivityconstanttau.input
@@ -5,7 +5,7 @@ DtInitial = 1 # [s]
 TEnd = 2 # [s]
 
 [Grid]
-File = ../../implicit/2p/grids/test_2p.dgf
+File = ../../porousmediumflow/2p/implicit/grids/test_2p.dgf
 
 [Diffusivity]
-File = constanttau
\ No newline at end of file
+File = constanttau
diff --git a/test/material/fluidmatrixinteractions/test_effectivediffusivitymillingtonquirk.input b/test/material/fluidmatrixinteractions/test_effectivediffusivitymillingtonquirk.input
index 89689d8a68f71da2b7b253f0729e2a6047f7d87e..679d164d785ada276b1af6bcbe2379d7df71c888 100644
--- a/test/material/fluidmatrixinteractions/test_effectivediffusivitymillingtonquirk.input
+++ b/test/material/fluidmatrixinteractions/test_effectivediffusivitymillingtonquirk.input
@@ -3,7 +3,7 @@ DtInitial = 1 # [s]
 TEnd = 2 # [s]
 
 [Grid]
-File = ../../implicit/2p/grids/test_2p.dgf
+File = ../../porousmediumflow/2p/implicit/grids/test_2p.dgf
 
 [Diffusivity]
-File = millingtonquirk
\ No newline at end of file
+File = millingtonquirk