diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
index bf2f9f486da..78df30866b9 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
@@ -312,6 +312,7 @@ public class CloudSolrServerTest extends AbstractFullDistribZkTestBase {
     indexDoc(doc);
   }
   
+  @BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5880")
   public void testShutdown() throws MalformedURLException {
     CloudSolrServer server = new CloudSolrServer("[ff01::114]:33332");
     try {
@@ -320,8 +321,6 @@ public class CloudSolrServerTest extends AbstractFullDistribZkTestBase {
       fail("Expected exception");
     } catch (SolrException e) {
       assertTrue(e.getCause() instanceof TimeoutException);
-    } catch (RuntimeException e) {
-      assertTrue(e.getCause() instanceof TimeoutException);
     } finally {
       server.shutdown();
     }