Index: docs/intro.pod
===================================================================
--- docs/intro.pod	(.../trunk)	(revision 43474)
+++ docs/intro.pod	(.../branches/no_running_make_test)	(revision 43476)
@@ -145,7 +145,7 @@
 Substituting make for the name of the make program on your platform. The output
 will look something like this:
 
- C:\Perl\bin\perl.exe t\harness --gc-debug --running-make-test
+ C:\Perl\bin\perl.exe t\harness --gc-debug 
    t\library\*.t  t\op\*.t  t\pmc\*.t  t\run\*.t  t\native_pbc\*.t
    imcc\t\*\*.t  t\dynpmc\*.t  t\p6rules\*.t t\src\*.t t\perl\*.t
  t\library\dumper...............ok
Index: lib/Parrot/Harness/Options.pm
===================================================================
--- lib/Parrot/Harness/Options.pm	(.../trunk)	(revision 43474)
+++ lib/Parrot/Harness/Options.pm	(.../branches/no_running_make_test)	(revision 43476)
@@ -28,9 +28,6 @@
     my @argv = @_;
 
     my %longopts;
-    $longopts{running_make_test} = grep { $_ eq '--running-make-test' } @argv;
-    @argv = grep { $_ ne '--running-make-test' } @argv;
-
     $longopts{gc_debug} = grep { $_ eq '--gc-debug' } @argv;
     @argv = grep { $_ ne '--gc-debug' } @argv;
 
@@ -130,7 +127,6 @@
     -r         ... assemble to PBC run PBC
     -O[012]    ... optimize
     -D[number] ... pass debug flags to parrot interpreter
-    --running-make-test
     --gc-debug
     --core-tests
     --runcore-tests
Index: t/pharness/03-handle_long_options.t
===================================================================
--- t/pharness/03-handle_long_options.t	(.../trunk)	(revision 43474)
+++ t/pharness/03-handle_long_options.t	(.../branches/no_running_make_test)	(revision 43476)
@@ -13,7 +13,7 @@
 };
 plan( skip_all => 't/harness only runs once configuration has completed' )
     if $@;
-plan( tests => 12 );
+plan( tests => 11 );
 use Carp;
 use Parrot::Harness::Options qw( handle_long_options );
 
@@ -22,13 +22,11 @@
 @argv = qw(
     -wv
     -O2
-    --running-make-test
     --gc-debug
     t/postconfigure/*.t
 ); # */
 
 ($longopts, @argv) = handle_long_options(@argv);
-ok($longopts->{running_make_test}, "Captured long option");
 ok($longopts->{gc_debug}, "Captured long option");
 %still_argv = map {$_, 1} @argv;
 ok($still_argv{'-wv'}, "Combined short options still present in \@ARGV");
Index: t/harness
===================================================================
--- t/harness	(.../trunk)	(revision 43474)
+++ t/harness	(.../branches/no_running_make_test)	(revision 43476)
@@ -31,8 +31,6 @@
 local @ARGV = @ARGV;
 (my $longopts, @ARGV) = handle_long_options(@ARGV);
 
-$ENV{RUNNING_MAKE_TEST} = $longopts->{running_make_test};
-
 # Suck the short options into the TEST_PROG_ARGS
 # environmental variable.
 my %opts;
@@ -189,10 +187,6 @@
 
 =over 4
 
-=item C<--running-make-test>
-
-Some test scripts run more quickly when this is set.
-
 =item C<--gc-debug>
 
 Invoke parrot with '--gc-debug'.
Index: config/gen/makefiles/root.in
===================================================================
--- config/gen/makefiles/root.in	(.../trunk)	(revision 43474)
+++ config/gen/makefiles/root.in	(.../branches/no_running_make_test)	(revision 43476)
@@ -1887,9 +1887,7 @@
 #
 ###############################################################################
 
-# The --running-make-test argument is currently used by long-running tests
-# to disable GC_DEBUG.
-EXTRA_TEST_ARGS := --gc-debug --running-make-test
+EXTRA_TEST_ARGS := --gc-debug
 DISTRO_TEST_FILES := \
     t/distro/*.t
 BENCHMARK_TEST_FILES := \