diff --git a/opm/core/utility/cart_grid.c b/opm/core/utility/cart_grid.c
index ebac549e..61d59481 100644
--- a/opm/core/utility/cart_grid.c
+++ b/opm/core/utility/cart_grid.c
@@ -723,28 +723,3 @@ fill_cart_geometry_2d(struct UnstructuredGrid *G,
         }
     }
 }
-
-
-
-
-
-#if UNIT_TEST
-int main(void)
-{
-
-    struct UnstructuredGrid *g = create_cart_grid_2d(2,2);
-    int i;
-    int k;
-    for(i=0; i<g->number_of_cells; ++i)
-    {
-        fprintf(stderr, "%d: ", i);
-        for (k=g->cell_facepos[i]; k<g->cell_facepos[i+1]; ++k)
-        {
-            fprintf(stderr, "%d ", g->cell_faces[k]);
-        }
-        fprintf(stderr, "\n");
-    }
-    free_grid(g);
-    return 0;
-}
-#endif
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d84686f2..09d30fd9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,8 @@ test_readpolymer				\
 test_readvector					\
 test_sf2p					\
 test_writeVtkData				\
-unit_test
+unit_test					\
+test_cartgrid
 
 bo_resprop_test_SOURCES = bo_resprop_test.cpp
 monotcubicinterpolator_test_SOURCES = monotcubicinterpolator_test.cpp
@@ -39,6 +40,7 @@ test_readvector_SOURCES   = test_readvector.cpp
 test_sf2p_SOURCES         = test_sf2p.cpp
 test_writeVtkData_SOURCES = test_writeVtkData.cpp
 unit_test_SOURCES         = unit_test.cpp
+test_cartgrid_SOURCES     = test_cartgrid.cpp
 
 if UMFPACK
 noinst_PROGRAMS    += test_cfs_tpfa
diff --git a/tests/test_cartgrid.cpp b/tests/test_cartgrid.cpp
new file mode 100644
index 00000000..c1baa1c6
--- /dev/null
+++ b/tests/test_cartgrid.cpp
@@ -0,0 +1,41 @@
+/*
+  Copyright 2012 SINTEF ICT, Applied Mathematics.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include <opm/core/utility/cpgpreprocess/cgridinterface.h>
+#include <opm/core/utility/cart_grid.h>
+#include <opm/core/grid.h>
+#include <cstdio>
+
+int main(void)
+{
+    using namespace std;
+    struct UnstructuredGrid *g = create_cart_grid_2d(2, 2);
+    int i;
+    int k;
+    for (i = 0; i < g->number_of_cells; ++i) {
+        fprintf(stderr, "%d: ", i);
+        for (k = g->cell_facepos[i]; k < g->cell_facepos[i + 1]; ++k) {
+            fprintf(stderr, "%d ", g->cell_faces[k]);
+        }
+        fprintf(stderr, "\n");
+    }
+    free_grid(g);
+    return 0;
+}