diff --git a/tests/topotests/bgp_features/test_bgp_features.py b/tests/topotests/bgp_features/test_bgp_features.py
index 48254e6d89..a27aaf9ec7 100755
--- a/tests/topotests/bgp_features/test_bgp_features.py
+++ b/tests/topotests/bgp_features/test_bgp_features.py
@@ -229,7 +229,7 @@ def test_bgp_shutdown_message():
         else:
             found = ''
         assertmsg = "Incorrect BGP shutdown message received on router R{}".format(rtrNum)
-        assert found == '8 bytes 41 42 43 44 61 62 63 64'
+        assert found == '8 bytes 41 42 43 44 61 62 63 64', assertmsg
 
     # tgen.mininet_cli()
 
@@ -261,13 +261,6 @@ def test_bgp_no_shutdown():
         assert res is None, assertmsg
 
 
-def test_bgp_instance_shutdown():
-    tgen = get_topogen()
-
-    # Skip if previous fatal error condition is raised
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
 
 if __name__ == "__main__":
     args = ["-s"] + sys.argv[1:]