diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
index 2fd5e418d7..2a81182dc0 100644
--- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
@@ -117,16 +117,6 @@
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B086B0C72F8A5814FF48795531F21635"
-               BuildableName = "SignalMetadataKit-Unit-Tests.xctest"
-               BlueprintName = "SignalMetadataKit-Unit-Tests"
-               ReferencedContainer = "container:Pods/Pods.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
          <TestableReference
             skipped = "YES">
             <BuildableReference
diff --git a/SignalServiceKit/tests/Messages/MessageProcessingIntegrationTest.swift b/SignalServiceKit/tests/Messages/MessageProcessingIntegrationTest.swift
index 6b9aa77087..da22ac202a 100644
--- a/SignalServiceKit/tests/Messages/MessageProcessingIntegrationTest.swift
+++ b/SignalServiceKit/tests/Messages/MessageProcessingIntegrationTest.swift
@@ -117,7 +117,11 @@ class MessageProcessingIntegrationTest: SSKBaseTestSwift {
         waitForExpectations(timeout: 1.0)
     }
 
-    func test_contactMessage_UuidOnlyEnvelope() {
+    func test_contactMessage_UuidOnlyEnvelope() throws {
+        // This test is extremely flakey and has been disabled since it leaves our CI unreliable
+        #if BROKEN_TESTS
+            throw XCTSkip()
+        #endif
 
         write { transaction in
             try! self.runner.initialize(senderClient: self.bobClient,