diff --git a/integration/.gitignore b/integration/.gitignore
index 4bf84b0cd..0b56d613b 100644
--- a/integration/.gitignore
+++ b/integration/.gitignore
@@ -12,3 +12,5 @@ json
 *.idx.gz
 dirs-*
 *.out
+csrftokens.txt
+s4d
diff --git a/integration/h1/config.xml b/integration/h1/config.xml
index f82830acc..1506af089 100644
--- a/integration/h1/config.xml
+++ b/integration/h1/config.xml
@@ -1,7 +1,6 @@
 <configuration version="2">
     <repository id="default" directory="s1" ro="false" ignorePerms="false">
         <node id="373HSRPQLPNLIJYKZVQFP4PKZ6R2ZE6K3YD442UJHBGBQGWWXAHA"></node>
-        <node id="EJHMPAQOGCVORISB4IS3SYYVJXTKJGLTU66DIQPGJ5D2GXGQ3OWQ"></node>
         <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA"></node>
         <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ"></node>
         <versioning></versioning>
diff --git a/integration/h4/config.xml b/integration/h4/config.xml
index 8d6e15818..bbf54fba4 100644
--- a/integration/h4/config.xml
+++ b/integration/h4/config.xml
@@ -5,6 +5,9 @@
         <node id="373HSRPQLPNLIJYKZVQFP4PKZ6R2ZE6K3YD442UJHBGBQGWWXAHA" name="s3"></node>
         <node id="EJHMPAQOGCVORISB4IS3SYYVJXTKJGLTU66DIQPGJ5D2GXGQ3OWQ" name="s4"></node>
     </repository>
+    <repository id="default" directory="s4d" ro="false">
+        <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="s1"></node>
+    </repository>
     <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="s1">
         <address>127.0.0.1:22001</address>
     </node>
diff --git a/integration/test.sh b/integration/test.sh
index 4c5db1538..647bd9512 100755
--- a/integration/test.sh
+++ b/integration/test.sh
@@ -105,10 +105,11 @@ alterFiles() {
 	pkill -CONT syncthing
 }
 
+rm -f h?/*.idx.gz
+rm -rf s? s??-? s4d
+
 echo "Setting up files..."
 for i in 1 2 3 12-1 12-2 23-2 23-3; do
-	rm -f h$i/*.idx.gz
-	rm -rf "s$i"
 	mkdir "s$i"
 	pushd "s$i" >/dev/null
 	echo "  $i: random nonoverlapping"
@@ -125,6 +126,9 @@ for i in 1 2 3 12-1 12-2 23-2 23-3; do
 	popd >/dev/null
 done
 
+mkdir s4d
+echo somerandomdata > s4d/extrafile
+
 echo "MD5-summing..."
 for i in 1 2 3 12-1 12-2 23-2 23-3 ; do
 	pushd "s$i" >/dev/null