diff --git a/test/Makefile.am b/test/Makefile.am
index 3d5024a3c2..221d92244b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -10,7 +10,8 @@ TESTS = test_sanity.py				\
 	test_rsc.py				\
 	test_exit.py				\
 	test_signal.py				\
-	test_backend.py
+	test_backend.py				\
+	test_masterurl_failure.py
 
 EXTRA_DIST =					\
         *.xml *.php *wu *result *output *input
diff --git a/test/Makefile.in b/test/Makefile.in
index ddc42f2372..93e647df2b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -178,7 +178,8 @@ TESTS = test_sanity.py				\
 	test_rsc.py				\
 	test_exit.py				\
 	test_signal.py				\
-	test_backend.py
+	test_backend.py				\
+	test_masterurl_failure.py
 
 
 EXTRA_DIST = \
@@ -200,8 +201,8 @@ CONFIG_CLEAN_FILES = version.inc version.py
 SCRIPTS = $(noinst_SCRIPTS)
 
 DIST_SOURCES =
-DIST_COMMON = $(top_srcdir)/Makefile.incl Makefile.am Makefile.in \
-	version.inc.in version.py.in
+DIST_COMMON = README $(top_srcdir)/Makefile.incl Makefile.am \
+	Makefile.in version.inc.in version.py.in
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
diff --git a/test/test_masterurl_failure.py b/test/test_masterurl_failure.py
index ff36917d61..f2dea0c25d 100755
--- a/test/test_masterurl_failure.py
+++ b/test/test_masterurl_failure.py
@@ -6,16 +6,14 @@ from test_uc import *
 
 if __name__ == '__main__':
     test_msg("scheduler exponential backoff (master url failure)")
-    # Proxy('close_connection if $nconnections < -2; '+
-    #       'kill 6,%d if $nconnections>=100 '%os.getpid(), html=1)
+    Proxy('close_connection if $nconnections < 2; ', html=1)
     # Proxy(('print "hi nc=$nconnections start=$start nchars=$nchars url=$url\n"; ' +
     #        'close_connection if $nconnections < 2; '),
     #       html=1)
-    Proxy(( 'print "hi nc=$nconnections start=$start nchars=$nchars url=$url\n"; ' +
-           ''),
-          html=1)
-    ProjectUC()
+    # Proxy(( 'print "hi nc=$nconnections start=$start nchars=$nchars url=$url\n"; ' +
+    #        ''),
+    #       html=1)
+    ProjectUC(short_name='test_masterurl_failure')
     run_check_all()
 
     ## TODO: verify it took ??? seconds
-    ## TODO: time out after ??? seconds and fail this test