diff --git a/ocis-pkg/crypto/gencert_test.go b/ocis-pkg/crypto/gencert_test.go
index a38063d30..2ee323104 100644
--- a/ocis-pkg/crypto/gencert_test.go
+++ b/ocis-pkg/crypto/gencert_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
-func Test_ensureExistsDir(t *testing.T) {
+func TestEnsureExistsDir(t *testing.T) {
 	var tmpDir = t.TempDir()
 
 	type args struct {
@@ -47,7 +47,7 @@ func Test_ensureExistsDir(t *testing.T) {
 	}
 }
 
-func Test_persistKey(t *testing.T) {
+func TestPersistKey(t *testing.T) {
 	p256 := elliptic.P256()
 	var (
 		tmpDir     = t.TempDir()
@@ -96,7 +96,7 @@ func Test_persistKey(t *testing.T) {
 	}
 }
 
-func Test_persistCertificate(t *testing.T) {
+func TestPersistCertificate(t *testing.T) {
 	p256 := elliptic.P256()
 	var (
 		tmpDir     = t.TempDir()
diff --git a/ocis-pkg/os/os_test.go b/ocis-pkg/os/os_test.go
index 5b7339ee0..8f643b96a 100644
--- a/ocis-pkg/os/os_test.go
+++ b/ocis-pkg/os/os_test.go
@@ -8,7 +8,7 @@ import (
 	pkgos "github.com/owncloud/ocis/ocis-pkg/os"
 )
 
-func Test_mustUserConfigDir(t *testing.T) {
+func TestMustUserConfigDir(t *testing.T) {
 	configDir, _ := os.UserConfigDir()
 	type args struct {
 		prefix    string
@@ -42,23 +42,25 @@ func Test_mustUserConfigDir(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			if tt.resetHome {
-				if err := os.Setenv("HOME", ""); err != nil {
-					t.Error(err)
-				}
+				unsetHome(t)
 			}
 
 			defer func() {
 				if r := recover(); r != nil && !tt.panic {
-					t.Errorf("should have panicked!")
+					t.Errorf("should have panicked but didn't")
 				}
 			}()
 
 			if got := pkgos.MustUserConfigDir(tt.args.prefix, tt.args.extension); got != tt.want {
 				t.Errorf("MustUserConfigDir() = %v, want %v", got, tt.want)
 			}
-
 		})
 	}
 }
+
+func unsetHome(t *testing.T) {
+	if err := os.Setenv("HOME", ""); err != nil {
+		t.Error(err)
+	}
+}