diff --git a/libnetwork/errors_test.go b/libnetwork/errors_test.go
index 6e6c6c107c..90a30d3408 100644
--- a/libnetwork/errors_test.go
+++ b/libnetwork/errors_test.go
@@ -7,13 +7,12 @@ import (
 )
 
 func TestErrorInterfaces(t *testing.T) {
-	badRequestErrorList := []error{ErrInvalidID(""), ErrInvalidName(""), ErrInvalidJoin{}, ErrInvalidNetworkDriver(""), InvalidContainerIDError(""), ErrNoSuchNetwork(""), ErrNoSuchEndpoint("")}
+	badRequestErrorList := []error{ErrInvalidID(""), ErrInvalidName(""), ErrInvalidJoin{}, ErrInvalidNetworkDriver(""), InvalidContainerIDError("")}
 	for _, err := range badRequestErrorList {
 		switch u := err.(type) {
 		case types.BadRequestError:
-			return
 		default:
-			t.Fatalf("Failed to detect err %v is of type BadRequestError. Got type: %T", err, u)
+			t.Errorf("Failed to detect err %v is of type BadRequestError. Got type: %T", err, u)
 		}
 	}
 
@@ -21,29 +20,26 @@ func TestErrorInterfaces(t *testing.T) {
 	for _, err := range maskableErrorList {
 		switch u := err.(type) {
 		case types.MaskableError:
-			return
 		default:
-			t.Fatalf("Failed to detect err %v is of type MaskableError. Got type: %T", err, u)
+			t.Errorf("Failed to detect err %v is of type MaskableError. Got type: %T", err, u)
 		}
 	}
 
-	notFoundErrorList := []error{NetworkTypeError(""), &UnknownNetworkError{}, &UnknownEndpointError{}}
+	notFoundErrorList := []error{NetworkTypeError(""), &UnknownNetworkError{}, &UnknownEndpointError{}, ErrNoSuchNetwork(""), ErrNoSuchEndpoint("")}
 	for _, err := range notFoundErrorList {
 		switch u := err.(type) {
 		case types.NotFoundError:
-			return
 		default:
-			t.Fatalf("Failed to detect err %v is of type NotFoundError. Got type: %T", err, u)
+			t.Errorf("Failed to detect err %v is of type NotFoundError. Got type: %T", err, u)
 		}
 	}
 
-	forbiddenErrorList := []error{NetworkTypeError(""), &UnknownNetworkError{}, &UnknownEndpointError{}}
+	forbiddenErrorList := []error{&ActiveContainerError{}}
 	for _, err := range forbiddenErrorList {
 		switch u := err.(type) {
 		case types.ForbiddenError:
-			return
 		default:
-			t.Fatalf("Failed to detect err %v is of type ForbiddenError. Got type: %T", err, u)
+			t.Errorf("Failed to detect err %v is of type ForbiddenError. Got type: %T", err, u)
 		}
 	}
 }