diff --git a/integration/test-delupd.sh b/integration/test-delupd.sh
index d24954e07..915e94fa5 100755
--- a/integration/test-delupd.sh
+++ b/integration/test-delupd.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
 
 # Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
 # Use of this source code is governed by an MIT-style license that can be
@@ -123,7 +125,7 @@ alterFiles() {
 }
 
 rm -rf h?/*.idx.gz h?/index
-chmod -R u+w s? s??-?
+chmod -R u+w s? s??-? || true
 rm -rf s? s??-?
 mkdir s1 s2 s3 s12-1 s12-2 s23-2 s23-3
 
diff --git a/integration/test-folders.sh b/integration/test-folders.sh
index 1c0de574b..2449af7e9 100755
--- a/integration/test-folders.sh
+++ b/integration/test-folders.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
 
 # Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
 # Use of this source code is governed by an MIT-style license that can be
@@ -29,7 +31,7 @@ setup() {
 	echo "Setting up dirs..."
 	mkdir -p s1
 	pushd s1 >/dev/null
-	rm -r */*[02468] 2>/dev/null
+	rm -r */*[02468] 2>/dev/null || true
 	rm -rf *2
 	for ((i = 0; i < 500; i++)) ; do
 		mkdir -p "$RANDOM/$RANDOM"
@@ -75,7 +77,7 @@ testConvergence() {
 	fi
 }
 
-chmod -R +w s? s??-?
+chmod -R +w s? s??-? || true
 rm -rf s? s??-?
 rm -rf f?/*.idx.gz f?/index
 
diff --git a/integration/test-http.sh b/integration/test-http.sh
index ef38719cd..92457227a 100755
--- a/integration/test-http.sh
+++ b/integration/test-http.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
 
 # Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
 # Use of this source code is governed by an MIT-style license that can be
@@ -19,7 +21,7 @@ echo Building
 go build http.go
 
 echo Starting
-chmod -R +w s1 s2
+chmod -R +w s1 s2 || true
 rm -rf s1 s2 h1/index h2/index
 syncthing -home h1 > 1.out 2>&1 &
 syncthing -home h2 > 2.out 2>&1 &
diff --git a/integration/test-merge.sh b/integration/test-merge.sh
index 629d8c2f7..310a5f5f3 100755
--- a/integration/test-merge.sh
+++ b/integration/test-merge.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
 
 # Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
 # Use of this source code is governed by an MIT-style license that can be
@@ -114,7 +116,7 @@ alterFiles() {
 }
 
 rm -rf h?/*.idx.gz h?/index
-chmod -R +w s? s??-? s4d
+chmod -R +w s? s??-? s4d || true
 rm -rf s? s??-? s4d
 
 echo "Setting up files..."