diff --git a/doc/fate_config.sh.template b/doc/fate_config.sh.template
index 059a1f862f..56acb2667d 100644
--- a/doc/fate_config.sh.template
+++ b/doc/fate_config.sh.template
@@ -26,5 +26,7 @@ extra_conf=     # extra configure options not covered above
 
 #make=          # name of GNU make if not 'make'
 makeopts=       # extra options passed to 'make'
+#makeopts_fate= # extra options passed to 'make' when running tests,
+                # defaulting to makeopts above if this is not set
 #tar=           # command to create a tar archive from its arguments on stdout,
                 # defaults to 'tar c'
diff --git a/tests/fate.sh b/tests/fate.sh
index bbdc7015a6..6fa631ea00 100755
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -75,7 +75,7 @@ compile()(
 fate()(
     test "$build_only" = "yes" && return
     cd ${build} || return
-    ${make} ${makeopts} -k fate
+    ${make} ${makeopts_fate-${makeopts}} -k fate
 )
 
 clean(){