diff --git a/cryptfs/config_test.go b/cryptfs/config_test.go
index 0dedbd9..11599c0 100644
--- a/cryptfs/config_test.go
+++ b/cryptfs/config_test.go
@@ -2,7 +2,6 @@ package cryptfs
 
 import (
 	"fmt"
-	"os"
 	"testing"
 	"time"
 )
@@ -37,7 +36,6 @@ func TestLoadV2PwdError(t *testing.T) {
 		Warn.Enabled = false
 	}
 	_, _, err := LoadConfFile("config_test/v2.conf", "wrongpassword")
-	Warn.SetOutput(os.Stderr)
 	if err == nil {
 		t.Errorf("Loading with wrong password must fail but it didn't")
 	}
diff --git a/main.go b/main.go
index 61e7020..0992612 100644
--- a/main.go
+++ b/main.go
@@ -176,7 +176,7 @@ func main() {
 		os.Exit(0)
 	}
 	if args.debug {
-		cryptfs.Debug.SetOutput(os.Stdout)
+		cryptfs.Debug.Enabled = true
 		cryptfs.Debug.Printf("Debug output enabled")
 	}
 	// Every operation below requires CIPHERDIR. Check that we have it.