diff --git a/.travis.yml b/.travis.yml
index a43d6ff1..f7be5903 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 sudo: required
+dist: xenial
 
 services:
   - docker
diff --git a/Makefile b/Makefile
index d2344c3f..59b7227b 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ vet: fmt
 
 .PHONY: test
 test: vet
-	go test -v ./... -cover
+	go test -v ./... -cover $(TEST_ARGS)
 
 .PHONY: build-linux
 build-linux:
diff --git a/pkg/mount-manager/fake-safe-mounter.go b/pkg/mount-manager/fake-safe-mounter.go
index caa90615..0e0a4a29 100644
--- a/pkg/mount-manager/fake-safe-mounter.go
+++ b/pkg/mount-manager/fake-safe-mounter.go
@@ -21,7 +21,7 @@ import (
 
 func NewFakeSafeMounter() *mount.SafeFormatAndMount {
 	fakeMounter := &mount.FakeMounter{MountPoints: []mount.MountPoint{}}
-	fakeExec := &exectesting.FakeExec{}
+	fakeExec := &exectesting.FakeExec{DisableScripts: true}
 	return &mount.SafeFormatAndMount{
 		Interface: fakeMounter,
 		Exec:      fakeExec,