diff --git a/etc/slurm.conf.example b/etc/slurm.conf.example
index bc92244eabe99623dbec5b2bd0ea2dd9a1090d6e..70a1053bef02d868bf88b530300be253aaaf4234 100644
--- a/etc/slurm.conf.example
+++ b/etc/slurm.conf.example
@@ -59,7 +59,7 @@ Waittime=0
 # SCHEDULING
 SchedulerType=sched/backfill
 #SchedulerAuth=
-SelectType=select/linear
+#SelectType=select/linear
 FastSchedule=1
 #PriorityType=priority/multifactor
 #PriorityDecayHalfLife=14-0
@@ -90,4 +90,4 @@ JobCompType=jobcomp/none
 #
 # COMPUTE NODES
 NodeName=linux[1-32] Procs=1 State=UNKNOWN
-PartitionName=debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP
+PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP
diff --git a/testsuite/expect/regression.py b/testsuite/expect/regression.py
index 9520c6fa2c415aa9de6a1af3f11323ff9165c1f0..d59345cbb1cb3f43a293da955ca1669ca207d369 100755
--- a/testsuite/expect/regression.py
+++ b/testsuite/expect/regression.py
@@ -59,6 +59,7 @@ def main(argv=None):
                       action='callback', callback=test_parser,
                       help='comma or space separated string of tests to include')
     parser.add_option('-k', '--keep-logs', action='store_true', default=False)
+    parser.add_option('-s', '--stop-on-first-fail', action='store_true', default=False)
     (options, args) = parser.parse_args(args=argv)
 
     # Sanity check
@@ -130,6 +131,8 @@ def main(argv=None):
             failed_tests.append(test)
             os.rename(testlog_name, testlog_name+'.failed')
             sys.stdout.write('FAILED!\n')
+            if options.stop_on_first_fail:
+                break
         sys.stdout.flush()
 
     end_time = time.time()