diff --git a/src/lib/Gitolite/Test.pm b/src/lib/Gitolite/Test.pm
index e6e5a36..f42c463 100644
--- a/src/lib/Gitolite/Test.pm
+++ b/src/lib/Gitolite/Test.pm
@@ -37,6 +37,12 @@ use warnings;
 
 # ----------------------------------------------------------------------
 
+# make sure the user is ready for it
+if (not $ENV{GITOLITE_TEST} or $ENV{GITOLITE_TEST} ne 'y') {
+    print "Bail out! See t/README for information on how to run the tests.\n";
+    exit 255;
+}
+
 # required preamble for all tests
 try "
     DEF gsh = /TRACE: gsh.SOC=/
diff --git a/t/README b/t/README
index c863b41..6a98e27 100644
--- a/t/README
+++ b/t/README
@@ -1,8 +1,13 @@
+
+============================================
 WARNING: THE TEST SUITE DELETES STUFF FIRST!
+============================================
 
-Testing gitolite3 is now one command after the clone:
+Please run the tests ONLY on a userid where it's ok to LOSE DATA.
 
-    prove
+On such a userid, clone gitolite then run this command in the clone:
 
-But because it starts by cleaning the slate, it's best to do it on a spare
-userid that you are ok to lose data on.
+    GITOLITE_TEST=y prove
+
+http://sitaramc.github.com/gitolite/testing.html has more details.  It will
+also help you try out gitolite if you want to go beyond just the test suite.