diff --git a/Tests/NumLib/TestGradShapeFunction.cpp b/Tests/NumLib/TestGradShapeFunction.cpp
index f8ebb05efc916238aaa3174d7502d785f8cd3d7f..0da3f5a4732ac93043eac24cb17c77b23276c14a 100644
--- a/Tests/NumLib/TestGradShapeFunction.cpp
+++ b/Tests/NumLib/TestGradShapeFunction.cpp
@@ -53,11 +53,12 @@ template <class TestFeType_, template <typename, int> class ShapeMatrixPolicy_>
 struct TestCase
 {
     using TestFeType = TestFeType_;
-    static const int GlobalDim = TestFeType::global_dim;
     using ShapeMatrixTypes =
-        ShapeMatrixPolicy_<typename TestFeType::ShapeFunction, GlobalDim>;
+        ShapeMatrixPolicy_<typename TestFeType::ShapeFunction,
+                           TestFeType::ShapeFunction::DIM>;
     template <typename X>
-    using ShapeMatrixPolicy = ShapeMatrixPolicy_<X, GlobalDim>;
+    using ShapeMatrixPolicy =
+        ShapeMatrixPolicy_<X, TestFeType::ShapeFunction::DIM>;
 };
 
 using TestTypes =
@@ -108,7 +109,7 @@ public:
     using ShapeMatrixPolicy = typename T::template ShapeMatrixPolicy<X>;
     using MeshElementType = typename TestFeType::MeshElementType;
 
-    static const int dim = TestFeType::dim;
+    static const unsigned dim = TestFeType::dim;
     static const unsigned e_nnodes = TestFeType::e_nnodes;
     static const unsigned n_sample_pt_order2 = TestFeType::n_sample_pt_order2;
     static const unsigned n_sample_pt_order3 = TestFeType::n_sample_pt_order3;
@@ -157,7 +158,7 @@ public:
 };  // NumLibFemIsoTest
 
 template <class T>
-const int GradShapeFunctionTest<T>::dim;
+const unsigned GradShapeFunctionTest<T>::dim;
 
 template <class T>
 const unsigned GradShapeFunctionTest<T>::e_nnodes;