Index: lib/Parrot/Harness/Options.pm
===================================================================
--- lib/Parrot/Harness/Options.pm	(revision 37241)
+++ lib/Parrot/Harness/Options.pm	(working copy)
@@ -94,6 +94,7 @@
         'S' => '-runcore=switch',
         'b' => '-runcore=bounds',
         'f' => '-runcore=fast',
+        'r' => '-run-pbc',
     );
 
     my %mapped;
Index: t/pmc/sub.t
===================================================================
--- t/pmc/sub.t	(revision 37241)
+++ t/pmc/sub.t	(working copy)
@@ -892,13 +892,7 @@
 ok
 OUTPUT
 
-{
-
-    # the test has different output when run with --run-pbc (make testr)
-    # actually not - compiling creates 2 'initial'
-    #                running emts 'main'
-
-    my $code = <<'CODE';
+pir_output_is( <<'CODE', <<'OUT', ':immediate :postcomp' );
 .sub optc :immediate :postcomp
     print "initial\n"
 .end
@@ -906,22 +900,10 @@
     say "main"
 .end
 CODE
-    my $descr = ':immediate :postcomp';
-    if ( exists $ENV{TEST_PROG_ARGS} and $ENV{TEST_PROG_ARGS} =~ m/-r/ ) {
-        pir_output_is( $code, <<'OUT', $descr );
 initial
 initial
 main
 OUT
-    }
-    else {
-        pir_output_is( $code, <<'OUT', $descr );
-initial
-initial
-main
-OUT
-    }
-}
 
 pir_output_like( <<'CODE', <<'OUTPUT', ':anon' );
 .sub main :main
Index: t/pmc/namespace.t
===================================================================
--- t/pmc/namespace.t	(revision 37241)
+++ t/pmc/namespace.t	(working copy)
@@ -645,8 +645,8 @@
 
 SKIP:
 {
-    skip( "immediate test, doesn't with -r (from .pbc)", 1 )
-        if ( exists $ENV{TEST_PROG_ARGS} and $ENV{TEST_PROG_ARGS} =~ m/-r/ );
+    skip( "immediate test, doesn't with --run-pbc", 1 )
+        if ( exists $ENV{TEST_PROG_ARGS} and $ENV{TEST_PROG_ARGS} =~ m/--run-pbc/ );
 
     pir_output_is( <<'CODE', <<'OUTPUT', "get_global in current" );
 .HLL 'bork'
Index: t/pmc/exception.t
===================================================================
--- t/pmc/exception.t	(revision 37241)
+++ t/pmc/exception.t	(working copy)
@@ -535,7 +535,7 @@
 OUTPUT
 
 $ENV{TEST_PROG_ARGS} ||= '';
-my @todo = $ENV{TEST_PROG_ARGS} =~ /-r/
+my @todo = $ENV{TEST_PROG_ARGS} =~ /--run-pbc/
     ? ( todo => '.tailcall and lexical maps not thawed from PBC, RT #60650' )
     : ();
 pir_output_is( <<'CODE', <<'OUTPUT', "exit_handler via exit exception", @todo );
Index: t/compilers/imcc/syn/hll.t
===================================================================
--- t/compilers/imcc/syn/hll.t	(revision 37241)
+++ t/compilers/imcc/syn/hll.t	(working copy)
@@ -33,7 +33,7 @@
 OUT
 
 $ENV{TEST_PROG_ARGS} ||= '';
-my @todo = $ENV{TEST_PROG_ARGS} =~ /-r/
+my @todo = $ENV{TEST_PROG_ARGS} =~ /--run-pbc/
     ? ( todo => 'classes and HLL maps not thawed from PBC, RT #60648' )
     : ();
 pir_output_is( <<'CODE', <<'OUT', ".param :slurpy (using object)", @todo );
Index: t/compilers/imcc/syn/errors.t
===================================================================
--- t/compilers/imcc/syn/errors.t	(revision 37241)
+++ t/compilers/imcc/syn/errors.t	(working copy)
@@ -11,7 +11,7 @@
 use Parrot::Test;
 
 plan skip_all => 'No reason to compile invalid PBC here'
-    if $ENV{TEST_PROG_ARGS} && $ENV{TEST_PROG_ARGS} =~ m/-r/;
+    if $ENV{TEST_PROG_ARGS} && $ENV{TEST_PROG_ARGS} =~ m/--run-pbc/;
 
 plan tests => 5;
 
Index: t/op/exceptions.t
===================================================================
--- t/op/exceptions.t	(revision 37241)
+++ t/op/exceptions.t	(working copy)
@@ -424,7 +424,7 @@
 OUTPUT
 
 $ENV{TEST_PROG_ARGS} ||= '';
-my @todo = $ENV{TEST_PROG_ARGS} =~ /-r/
+my @todo = $ENV{TEST_PROG_ARGS} =~ /--run-pbc/
     ? ( todo => '.tailcall and lexical maps not thawed from PBC, RT #60650' )
     : ();
 pir_output_is( <<'CODE', <<'OUTPUT', "exit_handler via exit exception", @todo );
Index: t/op/lexicals.t
===================================================================
--- t/op/lexicals.t	(revision 37241)
+++ t/op/lexicals.t	(working copy)
@@ -12,7 +12,7 @@
 $ENV{TEST_PROG_ARGS} ||= '';
 
 plan( skip_all => 'lexicals not thawed properly from PBC, RT #60652' )
-    if $ENV{TEST_PROG_ARGS} =~ /-r/;
+    if $ENV{TEST_PROG_ARGS} =~ /--run-pbc/;
 
 plan( tests => 47 );