diff --git a/Scripts/developer_scripts/autotest_cgal b/Scripts/developer_scripts/autotest_cgal
index ebede9a23f7..e24c3ebc50a 100755
--- a/Scripts/developer_scripts/autotest_cgal
+++ b/Scripts/developer_scripts/autotest_cgal
@@ -855,8 +855,14 @@ fi
 # Detects cygwin
 if uname | grep -q "CYGWIN"; then
   log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake"
-  CMAKE_GENERATOR='-GNMake Makefiles'
-  MAKE_CMD='nmake'
+  JOM="`which jom`"
+  if [ -e "$JOM" ]; then 
+    CMAKE_GENERATOR="-GNMake Makefiles JOM'
+    MAKE_CMD='jom'
+  else 
+    CMAKE_GENERATOR='-GNMake Makefiles'
+    MAKE_CMD='nmake'
+  fi
   IS_CYGWIN='y'
 else
   log "${ACTUAL_LOGFILE}" "Non-cygwin linux detected, using system make."