diff --git a/internal/readpassword/extpass_test.go b/internal/readpassword/extpass_test.go
index cdb800c..4af775a 100644
--- a/internal/readpassword/extpass_test.go
+++ b/internal/readpassword/extpass_test.go
@@ -11,7 +11,7 @@ import (
 func TestMain(m *testing.M) {
 	// Shut up info output
 	tlog.Info.Enabled = false
-	m.Run()
+	os.Exit(m.Run())
 }
 
 func TestExtpass(t *testing.T) {
diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go
index 7517bc5..e20fc94 100644
--- a/tests/example_filesystems/example_filesystems_test.go
+++ b/tests/example_filesystems/example_filesystems_test.go
@@ -15,7 +15,7 @@ const statusTxtContent = "It works!\n"
 
 func TestMain(m *testing.M) {
 	test_helpers.ResetTmpDir(true)
-	m.Run()
+	os.Exit(m.Run())
 }
 
 // checkExampleFS - verify that "dir" contains the expected test files
diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go
index c006e8b..04686c2 100644
--- a/tests/test_helpers/helpers.go
+++ b/tests/test_helpers/helpers.go
@@ -109,7 +109,11 @@ func Mount(c string, p string, extraArgs ...string) error {
 
 	cmd := exec.Command(GocryptfsBinary, args...)
 	cmd.Stderr = os.Stderr
-	cmd.Stdout = os.Stdout
+	if testing.Verbose() {
+		// Don't show the "deprecated filesystem" warnings by default. These
+		// are not silenced by "-q".
+		cmd.Stdout = os.Stdout
+	}
 	return cmd.Run()
 }