diff --git a/regress/bin/of_hp_setup.pl b/regress/bin/of_hp_setup.pl
index 670e5cd..213376c 100755
--- a/regress/bin/of_hp_setup.pl
+++ b/regress/bin/of_hp_setup.pl
@@ -14,10 +14,12 @@ my $of_hp_listener;
 my $of_hp_community;
 
 # Process command line options
-unless ( GetOptions( "map=s" => \$mapFile, ) ) {
-	print "unrecognized option\n";
-	exit 1;
-}
+# Don't fail on unrecognised options, those failures are tricky
+# to diagnose. For example projects/controller_disconnect sets --emerg
+# Jean II
+Getopt::Long::Configure( 'pass_through' );
+GetOptions( "map=s" => \$mapFile, );
+Getopt::Long::Configure( 'default' );
 
 # If not specified on command line, use environment variable.
 # Try specific first, then try generic - Jean II
diff --git a/regress/bin/of_ovs_setup.pl b/regress/bin/of_ovs_setup.pl
index 7519833..f849902 100755
--- a/regress/bin/of_ovs_setup.pl
+++ b/regress/bin/of_ovs_setup.pl
@@ -15,10 +15,12 @@ my $mapFile;
 # Jean II
 
 # Process command line options
-unless ( GetOptions( "map=s" => \$mapFile, ) ) {
-	print "unrecognized option\n";
-	exit 1;
-}
+# Don't fail on unrecognised options, those failures are tricky
+# to diagnose. For example projects/controller_disconnect sets --emerg
+# Jean II
+Getopt::Long::Configure( 'pass_through' );
+GetOptions( "map=s" => \$mapFile, );
+Getopt::Long::Configure( 'default' );
 
 # If not specified on command line, use enviroment variable.
 # Try specific first, then try generic - Jean II
diff --git a/regress/bin/of_ovs_user_setup.pl b/regress/bin/of_ovs_user_setup.pl
index 91eee12..5d09d1f 100755
--- a/regress/bin/of_ovs_user_setup.pl
+++ b/regress/bin/of_ovs_user_setup.pl
@@ -15,10 +15,12 @@ my $mapFile;
 # Jean II
 
 # Process command line options
-unless ( GetOptions( "map=s" => \$mapFile, ) ) {
-	print "unrecognized option\n";
-	exit 1;
-}
+# Don't fail on unrecognised options, those failures are tricky
+# to diagnose. For example projects/controller_disconnect sets --emerg
+# Jean II
+Getopt::Long::Configure( 'pass_through' );
+GetOptions( "map=s" => \$mapFile, );
+Getopt::Long::Configure( 'default' );
 
 # If not specified on command line, use enviroment variable.
 # Try specific first, then try generic - Jean II
diff --git a/regress/bin/of_ovs_veth_test.pl b/regress/bin/of_ovs_veth_test.pl
index 7a56e1c..4f09714 100755
--- a/regress/bin/of_ovs_veth_test.pl
+++ b/regress/bin/of_ovs_veth_test.pl
@@ -38,6 +38,9 @@ push @ARGV, "--less_ports";
 # Don't bother with QoS currently, it's broken...
 push @ARGV, "--no_slicing";
 
+# The bother with emergency flow table tests, it's not supported...
+push @ARGV, "--no_emerg";
+
 # Don't forget to configure the OVS_ROOT environment variable
 # Jean II