diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ef76c272053f440960c0d12167f01c38cd0b192..fe1f5e836c2a516ce953fab4a6dd0b8a79ea6bac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1669,9 +1669,10 @@ endif(ENABLE_WRAP_JAVA)
 include(CPack)
 
 include(CTest)
-file(GLOB_RECURSE TESTFILES tutorial/*.geo)
+file(GLOB_RECURSE TESTFILES tutorial/*.geo demos/*.geo 
+                            benchmarks/?d/*.geo benchmarks/extrude/*.geo)
 foreach(TESTFILE ${TESTFILES})
-  add_test(${TESTFILE} ./gmsh ${TESTFILE} -3 -o ./tmp.msh)
+  add_test(${TESTFILE} ./gmsh ${TESTFILE} -3 -nopopup -o ./tmp.msh)
 endforeach()
 # if(HAVE_PYTHON)
 #   file(GLOB_RECURSE TESTFILES tutorial/*.py)