diff --git a/core/common/ccpackage/ccpackage_test.go b/core/common/ccpackage/ccpackage_test.go
index 7cb594ee3a2..4c8be475a9f 100644
--- a/core/common/ccpackage/ccpackage_test.go
+++ b/core/common/ccpackage/ccpackage_test.go
@@ -288,35 +288,30 @@ func TestMain(m *testing.M) {
 	// setup the MSP manager so that we can sign/verify
 	err := msptesttools.LoadMSPSetupForTesting()
 	if err != nil {
-		os.Exit(-1)
 		fmt.Printf("Could not initialize msp")
-		return
+		os.Exit(-1)
 	}
 
 	cryptoProvider, err := sw.NewDefaultSecurityLevelWithKeystore(sw.NewDummyKeyStore())
 	if err != nil {
 		fmt.Printf("Initialize cryptoProvider bccsp failed: %s", cryptoProvider)
 		os.Exit(-1)
-		return
 	}
 	localmsp = mspmgmt.GetLocalMSP(cryptoProvider)
 	if localmsp == nil {
-		os.Exit(-1)
 		fmt.Printf("Could not get msp")
-		return
+		os.Exit(-1)
 	}
 	signer, err = localmsp.GetDefaultSigningIdentity()
 	if err != nil {
-		os.Exit(-1)
 		fmt.Printf("Could not get signer")
-		return
+		os.Exit(-1)
 	}
 
 	signerSerialized, err = signer.Serialize()
 	if err != nil {
-		os.Exit(-1)
 		fmt.Printf("Could not serialize identity")
-		return
+		os.Exit(-1)
 	}
 
 	os.Exit(m.Run())
diff --git a/gossip/privdata/coordinator_test.go b/gossip/privdata/coordinator_test.go
index 569b77ec9dc..8044f35c261 100644
--- a/gossip/privdata/coordinator_test.go
+++ b/gossip/privdata/coordinator_test.go
@@ -607,14 +607,10 @@ func TestCoordinatorStoreInvalidBlock(t *testing.T) {
 			iterator, err := store.GetTxPvtRWSetByTxid(txn, nil)
 			if err != nil {
 				t.Fatalf("Failed iterating, got err %s", err)
-				iterator.Close()
-				return
 			}
 			res, err := iterator.Next()
 			if err != nil {
 				t.Fatalf("Failed iterating, got err %s", err)
-				iterator.Close()
-				return
 			}
 			require.Nil(t, res)
 			iterator.Close()
@@ -928,14 +924,10 @@ func TestCoordinatorToFilterOutPvtRWSetsWithWrongHash(t *testing.T) {
 			iterator, err := store.GetTxPvtRWSetByTxid(txn, nil)
 			if err != nil {
 				t.Fatalf("Failed iterating, got err %s", err)
-				iterator.Close()
-				return
 			}
 			res, err := iterator.Next()
 			if err != nil {
 				t.Fatalf("Failed iterating, got err %s", err)
-				iterator.Close()
-				return
 			}
 			require.Nil(t, res)
 			iterator.Close()
@@ -1433,14 +1425,10 @@ func TestProceedWithoutPrivateData(t *testing.T) {
 			iterator, err := store.GetTxPvtRWSetByTxid(txn, nil)
 			if err != nil {
 				t.Fatalf("Failed iterating, got err %s", err)
-				iterator.Close()
-				return
 			}
 			res, err := iterator.Next()
 			if err != nil {
 				t.Fatalf("Failed iterating, got err %s", err)
-				iterator.Close()
-				return
 			}
 			require.Nil(t, res)
 			iterator.Close()
diff --git a/gossip/state/state_test.go b/gossip/state/state_test.go
index 3c3dcbbd399..0be20ddb790 100644
--- a/gossip/state/state_test.go
+++ b/gossip/state/state_test.go
@@ -1767,9 +1767,8 @@ func waitUntilTrueOrTimeout(t *testing.T, predicate func() bool, timeout time.Du
 		t.Log("Done.")
 		break
 	case <-time.After(timeout):
-		t.Fatal("Timeout has expired")
 		close(ch)
-		break
+		t.Fatal("Timeout has expired")
 	}
 	t.Log("Stop waiting until timeout or true")
 }
diff --git a/protoutil/proputils_test.go b/protoutil/proputils_test.go
index 0436ab63f72..c10804a7c9f 100644
--- a/protoutil/proputils_test.go
+++ b/protoutil/proputils_test.go
@@ -480,28 +480,24 @@ func TestMain(m *testing.M) {
 	// setup the MSP manager so that we can sign/verify
 	err := msptesttools.LoadMSPSetupForTesting()
 	if err != nil {
-		os.Exit(-1)
 		fmt.Printf("Could not initialize msp")
-		return
+		os.Exit(-1)
 	}
 	cryptoProvider, err := sw.NewDefaultSecurityLevelWithKeystore(sw.NewDummyKeyStore())
 	if err != nil {
-		os.Exit(-1)
 		fmt.Printf("Could not initialize cryptoProvider")
-		return
+		os.Exit(-1)
 	}
 	signer, err = mspmgmt.GetLocalMSP(cryptoProvider).GetDefaultSigningIdentity()
 	if err != nil {
-		os.Exit(-1)
 		fmt.Printf("Could not get signer")
-		return
+		os.Exit(-1)
 	}
 
 	signerSerialized, err = signer.Serialize()
 	if err != nil {
-		os.Exit(-1)
 		fmt.Printf("Could not serialize identity")
-		return
+		os.Exit(-1)
 	}
 
 	os.Exit(m.Run())