diff --git a/travis-ci/vmtest/mkrootfs.sh b/travis-ci/vmtest/mkrootfs.sh
index a8c8d9a..6928240 100755
--- a/travis-ci/vmtest/mkrootfs.sh
+++ b/travis-ci/vmtest/mkrootfs.sh
@@ -97,10 +97,7 @@ rm -rf "$root/var/lib/pacman/sync/"
 	"$root/usr/lib/libgfortran."* \
 	"$root/usr/lib/libgo."*
 # We don't need any documentation.
-rm -rf "$root/usr/share/doc" \
-	"$root/usr/share/help" \
-	"$root/usr/share/man" \
-	"$root/usr/share/texinfo"
+rm -rf "$root/usr/share/{doc,help,man,texinfo}"
 
 chroot "${root}" /bin/busybox --install
 
@@ -123,18 +120,23 @@ EOF
 chmod 644 "$root/etc/inittab"
 
 mkdir -m 755 "$root/etc/init.d" "$root/etc/rcS.d"
-cat > "$root/etc/rcS.d/S40network" << "EOF"
+cat > "$root/etc/rcS.d/S10-mount" << "EOF"
+#!/bin/sh
+
+/bin/mount -a
+EOF
+chmod 755 "$root/etc/rcS.d/S10-mount"
+
+cat > "$root/etc/rcS.d/S40-network" << "EOF"
 #!/bin/sh
 
 ip link set lo up
 EOF
-chmod 755 "$root/etc/rcS.d/S40network"
+chmod 755 "$root/etc/rcS.d/S40-network"
 
 cat > "$root/etc/init.d/rcS" << "EOF"
 #!/bin/sh
 
-/bin/mount -a
-
 for path in /etc/rcS.d/S*; do
 	[ -x "$path" ] && "$path"
 done
diff --git a/travis-ci/vmtest/run_selftests.sh b/travis-ci/vmtest/run_selftests.sh
index 910519a..0d19926 100755
--- a/travis-ci/vmtest/run_selftests.sh
+++ b/travis-ci/vmtest/run_selftests.sh
@@ -10,7 +10,7 @@ test_progs() {
 test_maps() {
 	echo TEST_MAPS
 	# Allow failing on older kernels.
-	./test_maps || [ ${KERNEL} != 'LATEST' ]
+	./test_maps
 }
 
 test_verifier() {
@@ -31,13 +31,9 @@ fi
 
 cd libbpf/selftests/bpf
 
-set +e
-exitcode=0
-for test_func in test_progs test_maps test_verifier; do
-	${test_func}; c=$?
-	if [[ $c -ne 0 ]]; then
-		exitcode=$c
-	fi
-done
+test_progs
 
-exit $exitcode
+if [[ "${KERNEL}" == 'latest' ]]; then
+	test_maps
+	test_verifier
+fi