diff --git a/.travis.yml b/.travis.yml
index 3bd5fb210..d16723b6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ env:
     - GOTAGS=cmount
     - GO111MODULE=off
     - GITHUB_USER=ncw
+    - GOTRACEBACK=all
     - secure: gU8gCV9R8Kv/Gn0SmCP37edpfIbPoSvsub48GK7qxJdTU628H0KOMiZW/T0gtV5d67XJZ4eKnhJYlxwwxgSgfejO32Rh5GlYEKT/FuVoH0BD72dM1GDFLSrUiUYOdoHvf/BKIFA3dJFT4lk2ASy4Zh7SEoXHG6goBlqUpYx8hVA=
     - secure: Uaiveq+/rvQjO03GzvQZV2J6pZfedoFuhdXrLVhhHSeP4ZBca0olw7xaqkabUyP3LkVYXMDSX8EbyeuQT1jfEe5wp5sBdfaDtuYW6heFyjiHIIIbVyBfGXon6db4ETBjOaX/Xt8uktrgNge6qFlj+kpnmpFGxf0jmDLw1zgg7tk=
 addons:
diff --git a/cmd/mountlib/mounttest/fs.go b/cmd/mountlib/mounttest/fs.go
index 06a82505d..1395fe39e 100644
--- a/cmd/mountlib/mounttest/fs.go
+++ b/cmd/mountlib/mounttest/fs.go
@@ -39,6 +39,11 @@ var (
 
 // RunTests runs all the tests against all the VFS cache modes
 func RunTests(t *testing.T, fn MountFn) {
+	// Kill everything if the timer elapes
+	timer := time.AfterFunc(60*time.Second, func() {
+		panic("mount has locked up")
+	})
+	defer timer.Stop()
 	mountFn = fn
 	flag.Parse()
 	cacheModes := []vfs.CacheMode{