diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4de62aaae871c2d0fa1372f40136695a3cc40e7e..58465acd37becaec48e6294b6f296bc791b99481 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -386,6 +386,10 @@ file(COPY test/boxmodels/3p3c/infiltration-reference.vtu DESTINATION references)
 file(COPY test/boxmodels/3p3c/test_3p3c.input DESTINATION test/boxmodels/3p3c)
 file(COPY test/boxmodels/3p3cni/kuevette3p3cni-reference.vtu DESTINATION references)
 file(COPY test/boxmodels/3p3cni/test_3p3cni.input DESTINATION test/boxmodels/3p3cni)
+file(COPY test/boxmodels/co2/co2-reference.vtu DESTINATION references)
+file(COPY test/boxmodels/co2/test_co2.input DESTINATION test/boxmodels/co2)
+file(COPY test/boxmodels/co2ni/co2ni-reference.vtu DESTINATION references)
+file(COPY test/boxmodels/co2ni/test_co2ni.input DESTINATION test/boxmodels/co2ni)
 file(COPY test/boxmodels/mpnc/obstacle-reference.vtu DESTINATION references)
 file(COPY test/boxmodels/mpnc/test_mpnc.input DESTINATION test/boxmodels/mpnc)
 file(COPY test/boxmodels/mpnc/forchheimer1p-reference.vtp DESTINATION references)
@@ -450,6 +454,8 @@ add_test(test_2p2c     bin/runTest.sh references/injection-reference.vtu      in
 add_test(test_2p2cni   bin/runTest.sh references/waterair-reference.vtu       waterair-00010.vtu       test/boxmodels/2p2cni/test_2p2cni     -Grid.File test/boxmodels/2p2cni/grids/test_2p2cni.dgf          -TimeManager.TEnd 1e4     -TimeManager.DtInitial 250)
 add_test(test_3p3c     bin/runTest.sh references/infiltration-reference.vtu   infiltration-00007.vtu   test/boxmodels/3p3c/test_3p3c         -Grid.File test/boxmodels/3p3c/grids/test_3p3c_coarse.dgf       -TimeManager.TEnd 8.64e5  -TimeManager.DtInitial 8.64e4)
 add_test(test_3p3cni   bin/runTest.sh references/kuevette3p3cni-reference.vtu kuevette3p3cni-00010.vtu test/boxmodels/3p3cni/test_3p3cni     -Grid.File test/boxmodels/3p3cni/grids/kuev_3p3cni_coarse.dgf   -TimeManager.MaxTimeStepSize 200 -TimeManager.DtInitial 200)
+add_test(test_co2      bin/runTest.sh references/co2-reference.vtu            co2-00000.vtu            test/boxmodels/co2/test_co2)
+add_test(test_co2ni    bin/runTest.sh references/co2ni-reference.vtu          co2ni-00000.vtu          test/boxmodels/co2ni/test_co2ni)
 add_test(test_mpnc     bin/runTest.sh references/obstacle-reference.vtu       obstacle-00010.vtu       test/boxmodels/mpnc/test_mpnc         -Grid.File test/boxmodels/mpnc/grids/obstacle_24x16.dgf         -TimeManager.TEnd 1e4     -TimeManager.DtInitial 250)
 add_test(test_forchheimer1p    bin/runTest.sh references/forchheimer1p-reference.vtp      test_forchheimer1p-00002.vtp       test/boxmodels/mpnc/test_forchheimer1p  -Grid.File test/boxmodels/mpnc/grids/forchheimer1d.dgf)
 add_test(test_forchheimer2p    bin/runTest.sh references/forchheimer2p-reference.vtu      test_forchheimer2p-00009.vtu       test/boxmodels/mpnc/test_forchheimer2p  -Grid.File test/boxmodels/mpnc/grids/obstacle_24x16.dgf)
diff --git a/test/boxmodels/CMakeLists.txt b/test/boxmodels/CMakeLists.txt
index 4cad6d699c0af1a123063c1bf11586989f0b2764..8c4bd75eae3adb6fab12da72f7907f061f5e5072 100644
--- a/test/boxmodels/CMakeLists.txt
+++ b/test/boxmodels/CMakeLists.txt
@@ -6,5 +6,7 @@ add_subdirectory("2p2cni")
 add_subdirectory("2pni")
 add_subdirectory("3p3c")
 add_subdirectory("3p3cni")
+add_subdirectory("co2")
+add_subdirectory("co2ni")
 add_subdirectory("mpnc")
 add_subdirectory("richards")
diff --git a/test/boxmodels/co2/CMakeLists.txt b/test/boxmodels/co2/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..37c44702510c8f97ef78a20d2f1141d86b344665 100644
--- a/test/boxmodels/co2/CMakeLists.txt
+++ b/test/boxmodels/co2/CMakeLists.txt
@@ -0,0 +1,16 @@
+# build target for the CO2 test problem
+add_executable("test_co2" test_co2.cc)
+target_link_libraries("test_co2" ${DumuxLinkLibraries})
+
+# add required libraries and includes to the build flags 
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
+
+# make sure the grids are present in the build directory
+add_custom_command(TARGET "test_co2"
+                   POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E
+                        copy_directory 
+                           "${CMAKE_CURRENT_SOURCE_DIR}/grids"
+                           "${CMAKE_CURRENT_BINARY_DIR}/grids")
+
diff --git a/test/boxmodels/co2ni/CMakeLists.txt b/test/boxmodels/co2ni/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..993f84974ca2d660b093ab46143ee61d5c30a4da 100644
--- a/test/boxmodels/co2ni/CMakeLists.txt
+++ b/test/boxmodels/co2ni/CMakeLists.txt
@@ -0,0 +1,16 @@
+# build target for the CO2 non-isothermal test problem
+add_executable("test_co2ni" test_co2ni.cc)
+target_link_libraries("test_co2ni" ${DumuxLinkLibraries})
+
+# add required libraries and includes to the build flags 
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
+
+# make sure the grids are present in the build directory
+add_custom_command(TARGET "test_co2ni"
+                   POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E
+                        copy_directory 
+                           "${CMAKE_CURRENT_SOURCE_DIR}/grids"
+                           "${CMAKE_CURRENT_BINARY_DIR}/grids")
+