diff --git a/manifest b/manifest
index fe30409fc4..ec489b353d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunnecessary\sbranch\sfrom\sthe\sOP_String8\sopcode.
-D 2016-04-30T18:10:34.585
+C Change\sthe\sway\stester.tcl\shandes\s$argv\sso\sthat\sin\s"permutations.test\s<permutation>\s<filename>"\s<filename>\smay\sbe\sthe\sname\sof\sany\sfile\sin\sthe\stest/\sdirectory.
+D 2016-04-30T19:23:10.056
 F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@ -1115,7 +1115,7 @@ F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptable2.test c3d8c138f493207612960bbd6a8c50e84975e2ee
 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
-F test/tester.tcl 30c7a9be8601d1c1c9c93d013545ebcb28d64254
+F test/tester.tcl 3ace46dee55f07e28a1e3ab03258b929fefcee5b
 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1486,7 +1486,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 762bdc55f8878ee2ef65af2165a8e7fdbddf0160
-R c6bd6d9832f41be3a84777fb9beacd97
-U drh
-Z beaad3433e5488a905014b307adfe5b7
+P 459a0b456da69112605b37adc9af27d79e35a4d7
+R 23212a22e435d3100aef78ab9c45b327
+U dan
+Z 034fcb062ad20342a7b230d87b3ffc20
diff --git a/manifest.uuid b/manifest.uuid
index c3f171f13c..6ff03c7829 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-459a0b456da69112605b37adc9af27d79e35a4d7
\ No newline at end of file
+820c57bb24ad3d8663ca512e4022268b940bb2ee
\ No newline at end of file
diff --git a/test/tester.tcl b/test/tester.tcl
index 23810d09ee..9fbc7b2569 100644
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -521,7 +521,11 @@ if {[info exists cmdlinearg]==0} {
       }
 
       default {
-        lappend leftover [file normalize $a]
+        if {[file tail $a]==$a} {
+          lappend leftover $a
+        } else {
+          lappend leftover [file normalize $a]
+        }
       }
     }
   }