diff --git a/addons/GM2Calc/CMakeLists.txt b/addons/GM2Calc/CMakeLists.txt
index 98d0e4411..07a90bca4 100644
--- a/addons/GM2Calc/CMakeLists.txt
+++ b/addons/GM2Calc/CMakeLists.txt
@@ -1,4 +1,6 @@
 if(ENABLE_GM2Calc)
+  set(WITH_GM2Calc 1 CACHE INTERNAL WITH_GM2Calc)
+
   add_library(GM2Calc
     ffunctions.cpp
     gm2_1loop.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 74f4ea644..a288bdfca 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -61,3 +61,8 @@ add_flexiblesusy_bin_test(test_threshold_loop_functions)
 add_flexiblesusy_bin_test(test_spectrum_generator_settings)
 add_flexiblesusy_bin_test(test_which)
 add_flexiblesusy_bin_test(test_wrappers)
+
+if(WITH_GM2Calc)
+  add_flexiblesusy_bin_test(test_gm2calc)
+  add_flexiblesusy_bin_test(test_MSSMNoFV_onshell)
+endif()