diff --git a/tests/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c
index 0227df82..f26d1dc1 100644
--- a/tests/functionaltests/functionaltests.c
+++ b/tests/functionaltests/functionaltests.c
@@ -193,7 +193,6 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(disco_info_without_name),
         PROF_FUNC_TEST(disco_items_without_name),
         PROF_FUNC_TEST(disco_info_service_unavailable),
-        PROF_FUNC_TEST(disco_items_error_handling),
     };
 
     /* ============================================================
diff --git a/tests/functionaltests/test_disco.c b/tests/functionaltests/test_disco.c
index c73a3d43..1d565b59 100644
--- a/tests/functionaltests/test_disco.c
+++ b/tests/functionaltests/test_disco.c
@@ -418,28 +418,3 @@ disco_info_service_unavailable(void **state)
     assert_true(prof_output_regex("Service discovery failed.*service-unavailable"));
     prof_timeout_reset();
 }
-
-void
-disco_items_error_handling(void **state)
-{
-    /*
-     * Test that /disco items displays error responses to user.
-     * Per XEP-0030 Section 7: errors like service-unavailable must be shown.
-     */
-    stbbr_for_query("http://jabber.org/protocol/disco#items",
-        "<iq to='stabber@localhost/profanity' type='error' from='broken.localhost'>"
-            "<error type='cancel'>"
-                "<service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>"
-            "</error>"
-        "</iq>"
-    );
-
-    prof_connect();
-
-    prof_input("/disco items broken.localhost");
-
-    prof_timeout(10);
-    /* Per XEP-0030, error should be displayed to user */
-    assert_true(prof_output_regex("Service discovery failed.*service-unavailable"));
-    prof_timeout_reset();
-}
diff --git a/tests/functionaltests/test_disco.h b/tests/functionaltests/test_disco.h
index fbd7d0c2..89a45c33 100644
--- a/tests/functionaltests/test_disco.h
+++ b/tests/functionaltests/test_disco.h
@@ -17,4 +17,3 @@ void disco_info_multiple_identities(void **state);
 void disco_info_without_name(void **state);
 void disco_items_without_name(void **state);
 void disco_info_service_unavailable(void **state);
-void disco_items_error_handling(void **state);