diff --git a/dumux/material/old_fluidsystems/h2o_n2_system.hh b/dumux/material/old_fluidsystems/h2o_n2_system.hh
index 3a0d4354a0f095f36a44cc6297223bd7c425e8fb..4fa3ff222dd7429ce6dbb4203078e9393b584f43 100644
--- a/dumux/material/old_fluidsystems/h2o_n2_system.hh
+++ b/dumux/material/old_fluidsystems/h2o_n2_system.hh
@@ -34,7 +34,7 @@
 
 #include <dumux/material/binarycoefficients/h2o_n2.hh>
 
-#include "defaultcomponents.hh"
+#include <dumux/material/fluidsystems/defaultcomponents.hh>
 
 #include <dumux/common/propertysystem.hh>
 
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index 0b4c0ab1559badf91ffdfa24212a976cdff4c2f2..824cd40d12b99cee9e999aad8681be300682f78d 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh
@@ -36,14 +36,14 @@
 #include <dune/grid/yaspgrid.hh>
 #include <dune/grid/sgrid.hh>
 
-// fluid properties
-//#include <dumux/material/old_fluidsystems/simple_h2o_n2_system.hh>
-#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
-
 #include <dumux/decoupled/2p2c/2p2cproblem.hh>
 #include <dumux/decoupled/2p2c/fvpressure2p2c.hh>
 #include <dumux/decoupled/2p2c/fvtransport2p2c.hh>
 
+// fluid properties
+//#include <dumux/material/old_fluidsystems/simple_h2o_n2_system.hh>
+#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
+
 #include "test_dec2p2c_spatialparams.hh"
 #include <dumux/linear/impetbicgstabilu0solver.hh>
 namespace Dumux