diff --git a/src/ifmib/ifmib_test.go b/src/ifmib/ifmib_test.go
index a46cc33..35513b2 100644
--- a/src/ifmib/ifmib_test.go
+++ b/src/ifmib/ifmib_test.go
@@ -14,6 +14,7 @@ func TestNewInterfaceMIB(t *testing.T) {
 
 	if mib == nil {
 		t.Fatal("NewInterfaceMIB returned nil")
+		return
 	}
 
 	if mib.handler == nil {
diff --git a/src/vpp/vpp_iface_test.go b/src/vpp/vpp_iface_test.go
index fb24e4f..391972c 100644
--- a/src/vpp/vpp_iface_test.go
+++ b/src/vpp/vpp_iface_test.go
@@ -15,6 +15,7 @@ func TestNewInterfaceManager(t *testing.T) {
 
 	if manager == nil {
 		t.Fatal("NewInterfaceManager() returned nil")
+		return
 	}
 
 	if manager.client != client {
@@ -32,7 +33,6 @@ func TestNewInterfaceManager(t *testing.T) {
 	if manager.watchingEvents {
 		t.Error("InterfaceManager should not be watching events initially")
 	}
-
 }
 
 func TestInterfaceManagerSetEventCallback(t *testing.T) {
diff --git a/src/vpp/vpp_stats_test.go b/src/vpp/vpp_stats_test.go
index a3bdb58..0cea8e3 100644
--- a/src/vpp/vpp_stats_test.go
+++ b/src/vpp/vpp_stats_test.go
@@ -15,6 +15,7 @@ func TestNewStatsManager(t *testing.T) {
 
 	if manager == nil {
 		t.Fatal("NewStatsManager() returned nil")
+		return
 	}
 
 	if manager.client != client {