diff --git a/pkg/lockfile/lockfile.go b/pkg/lockfile/lockfile.go
index 25a71ac90..52f6c0a62 100644
--- a/pkg/lockfile/lockfile.go
+++ b/pkg/lockfile/lockfile.go
@@ -128,9 +128,8 @@ func GetROLockfile(path string) (Locker, error) {
 func (l *LockFile) Lock() {
 	if l.ro {
 		panic("can't take write lock on read-only lock file")
-	} else {
-		l.lock(writeLock)
 	}
+	l.lock(writeLock)
 }
 
 // RLock locks the lockfile as a reader.
@@ -142,9 +141,8 @@ func (l *LockFile) RLock() {
 func (l *LockFile) TryLock() error {
 	if l.ro {
 		panic("can't take write lock on read-only lock file")
-	} else {
-		return l.tryLock(writeLock)
 	}
+	return l.tryLock(writeLock)
 }
 
 // TryRLock attempts to lock the lockfile as a reader.
diff --git a/pkg/unshare/unshare_test.go b/pkg/unshare/unshare_test.go
index 25e00002b..9832517a0 100644
--- a/pkg/unshare/unshare_test.go
+++ b/pkg/unshare/unshare_test.go
@@ -111,27 +111,22 @@ func TestUnshareNamespaces(t *testing.T) {
 		err := cmd.Run()
 		if err != nil {
 			t.Fatalf("run %q: %v: %s", name, err, buf.String())
-			break
 		}
 		if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
 			t.Fatalf("error parsing results: %v", err)
-			break
 		}
 		for ns := range CloneFlags {
 			linkTarget, err := os.Readlink("/proc/self/ns/" + ns)
 			if err != nil {
 				t.Fatalf("Reading link /proc/self/ns/%s: %v", ns, err)
-				os.Exit(1)
 			}
 			if ns == name || ns == "user" { // we always create a new user namespace
 				if report.Namespaces[ns] == linkTarget {
 					t.Fatalf("child is still in our %q namespace", name)
-					os.Exit(1)
 				}
 			} else {
 				if report.Namespaces[ns] != linkTarget {
 					t.Fatalf("child is not in our %q namespace", name)
-					os.Exit(1)
 				}
 			}
 		}
@@ -149,11 +144,9 @@ func TestUnsharePgrp(t *testing.T) {
 		err := cmd.Run()
 		if err != nil {
 			t.Fatalf("run: %v: %s", err, buf.String())
-			break
 		}
 		if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
 			t.Fatalf("error parsing results: %v", err)
-			break
 		}
 		if (report.Pgrp == syscall.Getpgrp()) != same {
 			t.Fatalf("expected %d == %d to be %v", report.Pgrp, syscall.Getpgrp(), same)
@@ -176,11 +169,9 @@ func TestUnshareSid(t *testing.T) {
 		err := cmd.Run()
 		if err != nil {
 			t.Fatalf("run: %v: %s", err, buf.String())
-			break
 		}
 		if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
 			t.Fatalf("error parsing results: %v", err)
-			break
 		}
 		if (report.Sid == sid) != same {
 			t.Fatalf("expected %d == %d to be %v", report.Sid, sid, same)
@@ -199,11 +190,9 @@ func TestUnshareOOMScoreAdj(t *testing.T) {
 		err := cmd.Run()
 		if err != nil {
 			t.Fatalf("run: %v: %s", err, buf.String())
-			break
 		}
 		if err = json.Unmarshal(buf.Bytes(), &report); err != nil {
 			t.Fatalf("error parsing results: %v", err)
-			break
 		}
 		if report.OOMScoreAdj != adj {
 			t.Fatalf("saw oom_score_adj %d to be %v", adj, report.OOMScoreAdj)