diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
index f08479b69..c9ee2d500 100644
--- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
@@ -28,7 +28,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1115976DB2D993FB7AAB33CEBB52F472"
+               BlueprintIdentifier = "237277EA071A0C42090E0E10F34EFC45"
                BuildableName = "SignalServiceKit.framework"
                BlueprintName = "SignalServiceKit"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -56,7 +56,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B50508FED0E49769CFCF3F5D7B5FCD61"
+               BlueprintIdentifier = "11B0EF2E18D829262A7DF015BEBB0909"
                BuildableName = "SignalServiceKit-Unit-Tests.xctest"
                BlueprintName = "SignalServiceKit-Unit-Tests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
diff --git a/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h
index 28afd3810..c2364cae7 100644
--- a/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h
+++ b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h
@@ -6,8 +6,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @interface OWSFakeCallMessageHandler : NSObject <OWSCallMessageHandler>
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m
index e2b51a93d..5925468c4 100644
--- a/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m
+++ b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m
@@ -1,37 +1,42 @@
-//  Created by Michael Kirk on 12/18/16.
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
+//
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//
 
 #import "OWSFakeCallMessageHandler.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @implementation OWSFakeCallMessageHandler
 
-- (void)receivedOffer:(OWSSignalServiceProtosCallMessageOffer *)offer fromCallerId:(NSString *)callerId
+- (void)receivedOffer:(SSKProtoCallMessageOffer *)offer fromCallerId:(NSString *)callerId
 {
     NSLog(@"%s", __PRETTY_FUNCTION__);
 }
 
-- (void)receivedAnswer:(OWSSignalServiceProtosCallMessageAnswer *)answer fromCallerId:(NSString *)callerId
+- (void)receivedAnswer:(SSKProtoCallMessageAnswer *)answer fromCallerId:(NSString *)callerId
 {
     NSLog(@"%s", __PRETTY_FUNCTION__);
 }
 
-- (void)receivedIceUpdate:(OWSSignalServiceProtosCallMessageIceUpdate *)iceUpdate fromCallerId:(NSString *)callerId
+- (void)receivedIceUpdate:(SSKProtoCallMessageIceUpdate *)iceUpdate fromCallerId:(NSString *)callerId
 {
     NSLog(@"%s", __PRETTY_FUNCTION__);
 }
 
-- (void)receivedHangup:(OWSSignalServiceProtosCallMessageHangup *)hangup fromCallerId:(NSString *)callerId
+- (void)receivedHangup:(SSKProtoCallMessageHangup *)hangup fromCallerId:(NSString *)callerId
 {
     NSLog(@"%s", __PRETTY_FUNCTION__);
 }
 
-- (void)receivedBusy:(OWSSignalServiceProtosCallMessageBusy *)busy fromCallerId:(NSString *)callerId
+- (void)receivedBusy:(SSKProtoCallMessageBusy *)busy fromCallerId:(NSString *)callerId
 {
     NSLog(@"%s", __PRETTY_FUNCTION__);
 }
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeContactsManager.h b/SignalServiceKit/src/Tests/OWSFakeContactsManager.h
index 97d38d088..0ac2786ea 100644
--- a/SignalServiceKit/src/Tests/OWSFakeContactsManager.h
+++ b/SignalServiceKit/src/Tests/OWSFakeContactsManager.h
@@ -6,8 +6,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @interface OWSFakeContactsManager : NSObject <ContactsManagerProtocol>
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeContactsManager.m b/SignalServiceKit/src/Tests/OWSFakeContactsManager.m
index fe3b8abe8..cf2a747dd 100644
--- a/SignalServiceKit/src/Tests/OWSFakeContactsManager.m
+++ b/SignalServiceKit/src/Tests/OWSFakeContactsManager.m
@@ -6,7 +6,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class UIImage;
+#ifdef DEBUG
 
 @implementation OWSFakeContactsManager
 
@@ -37,4 +37,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeMessageSender.h b/SignalServiceKit/src/Tests/OWSFakeMessageSender.h
index b6230ee84..00ce55670 100644
--- a/SignalServiceKit/src/Tests/OWSFakeMessageSender.h
+++ b/SignalServiceKit/src/Tests/OWSFakeMessageSender.h
@@ -6,6 +6,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @interface OWSFakeMessageSender : OWSMessageSender
 
 @property (nonatomic, nullable) dispatch_block_t enqueueMessageBlock;
@@ -14,4 +16,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeMessageSender.m b/SignalServiceKit/src/Tests/OWSFakeMessageSender.m
index b60d569e3..6b5ebca13 100644
--- a/SignalServiceKit/src/Tests/OWSFakeMessageSender.m
+++ b/SignalServiceKit/src/Tests/OWSFakeMessageSender.m
@@ -6,6 +6,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @implementation OWSFakeMessageSender
 
 - (void)enqueueMessage:(TSOutgoingMessage *)message
@@ -46,4 +48,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h
index d81bce2c6..73b76d209 100644
--- a/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h
+++ b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h
@@ -6,10 +6,14 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @interface OWSFakeNetworkManager : TSNetworkManager
 
 - (instancetype)init;
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m
index 994a3ec4a..03fcc23c8 100644
--- a/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m
+++ b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m
@@ -6,6 +6,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @implementation OWSFakeNetworkManager
 
 - (void)makeRequest:(TSRequest *)request
@@ -17,4 +19,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h
index b29a7ad9c..adf79cff3 100644
--- a/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h
+++ b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h
@@ -6,8 +6,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @interface OWSFakeNotificationsManager : NSObject <NotificationsProtocol>
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m
index 270c08bac..f42c63d61 100644
--- a/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m
+++ b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m
@@ -6,6 +6,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @implementation OWSFakeNotificationsManager
 
 - (void)notifyUserForIncomingMessage:(TSIncomingMessage *)incomingMessage
@@ -23,4 +25,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeProfileManager.h b/SignalServiceKit/src/Tests/OWSFakeProfileManager.h
index 00d58b3d3..d2cf1bbb0 100644
--- a/SignalServiceKit/src/Tests/OWSFakeProfileManager.h
+++ b/SignalServiceKit/src/Tests/OWSFakeProfileManager.h
@@ -6,8 +6,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @interface OWSFakeProfileManager : NSObject <ProfileManagerProtocol>
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/OWSFakeProfileManager.m b/SignalServiceKit/src/Tests/OWSFakeProfileManager.m
index 19a857a55..7a39a324c 100644
--- a/SignalServiceKit/src/Tests/OWSFakeProfileManager.m
+++ b/SignalServiceKit/src/Tests/OWSFakeProfileManager.m
@@ -8,6 +8,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @interface OWSFakeProfileManager ()
 
 @property (nonatomic, readonly) NSMutableDictionary<NSString *, OWSAES256Key *> *profileKeys;
@@ -68,4 +70,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/TestAppContext.h b/SignalServiceKit/src/Tests/TestAppContext.h
index b438e0c82..0f32d440c 100644
--- a/SignalServiceKit/src/Tests/TestAppContext.h
+++ b/SignalServiceKit/src/Tests/TestAppContext.h
@@ -6,8 +6,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @interface TestAppContext : NSObject <AppContext>
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/TestAppContext.m b/SignalServiceKit/src/Tests/TestAppContext.m
index 527f3e757..bbf3fc4bb 100644
--- a/SignalServiceKit/src/Tests/TestAppContext.m
+++ b/SignalServiceKit/src/Tests/TestAppContext.m
@@ -7,6 +7,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @interface TestAppContext ()
 
 @property (nonatomic) SSKTestKeychainStorage *testKeychainStorage;
@@ -150,4 +152,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Tests/TestKeychainStorage.swift b/SignalServiceKit/src/Tests/TestKeychainStorage.swift
index 828637ec3..8127738ea 100644
--- a/SignalServiceKit/src/Tests/TestKeychainStorage.swift
+++ b/SignalServiceKit/src/Tests/TestKeychainStorage.swift
@@ -4,6 +4,8 @@
 
 import Foundation
 
+#if DEBUG
+
 @objc
 public class SSKTestKeychainStorage: NSObject, SSKKeychainStorage {
 
@@ -50,3 +52,5 @@ public class SSKTestKeychainStorage: NSObject, SSKKeychainStorage {
         dataMap.removeValue(forKey: key)
     }
 }
+
+#endif
diff --git a/SignalServiceKit/tests/SSKBaseTest.h b/SignalServiceKit/tests/SSKBaseTest.h
index e0957284d..ffa150fe1 100644
--- a/SignalServiceKit/tests/SSKBaseTest.h
+++ b/SignalServiceKit/tests/SSKBaseTest.h
@@ -6,8 +6,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @interface SSKBaseTest : XCTestCase
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/tests/SSKBaseTest.m b/SignalServiceKit/tests/SSKBaseTest.m
index e32e30a9c..6b413e5ea 100644
--- a/SignalServiceKit/tests/SSKBaseTest.m
+++ b/SignalServiceKit/tests/SSKBaseTest.m
@@ -9,6 +9,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef DEBUG
+
 @implementation SSKBaseTest
 
 - (void)setUp
@@ -35,4 +37,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END