diff --git a/Podfile b/Podfile
index a161c4805..485fd48ea 100644
--- a/Podfile
+++ b/Podfile
@@ -11,7 +11,7 @@ def shared_pods
   pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
   pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git'
   # pod 'AxolotlKit', path: '../SignalProtocolKit'
-  pod 'SignalServiceKit', path: '.'
+  pod 'SignalServiceKit', path: '.', testspecs: ["Tests"]
   pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git'
   # pod 'HKDFKit', path: '../HKDFKit'
   pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit'
diff --git a/Podfile.lock b/Podfile.lock
index fb716fd9a..a4f52ea81 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -60,6 +60,20 @@ PODS:
     - SocketRocket
     - SwiftProtobuf
     - YapDatabase/SQLCipher
+  - SignalServiceKit/Tests (0.9.0):
+    - AFNetworking
+    - AxolotlKit
+    - CocoaLumberjack
+    - Curve25519Kit
+    - GRKOpenSSLFramework
+    - libPhoneNumber-iOS
+    - Mantle
+    - PromiseKit (~> 4.0)
+    - Reachability
+    - SAMKeychain
+    - SocketRocket
+    - SwiftProtobuf
+    - YapDatabase/SQLCipher
   - SocketRocket (0.5.1)
   - SQLCipher (3.4.2):
     - SQLCipher/standard (= 3.4.2)
@@ -144,6 +158,7 @@ DEPENDENCIES:
   - PureLayout
   - Reachability
   - SignalServiceKit (from `.`)
+  - SignalServiceKit/Tests (from `.`)
   - SocketRocket (from `https://github.com/signalapp/SocketRocket.git`, branch `mkirk/handle-sec-err`)
   - SQLCipher (from `https://github.com/sqlcipher/sqlcipher.git`, commit `d5c2bec`)
   - SSZipArchive
@@ -221,7 +236,7 @@ SPEC CHECKSUMS:
   PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
-  SignalServiceKit: a16410721705f896905c65ad718424fa20728e7d
+  SignalServiceKit: 89940928e278a1b43c40678e651eb547ab4b56d8
   SocketRocket: dbb1554b8fc288ef8ef370d6285aeca7361be31e
   SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990
   SSZipArchive: 51a800ebb77f95a8329b6ced1faaff394b47f509
@@ -229,6 +244,6 @@ SPEC CHECKSUMS:
   YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
 
-PODFILE CHECKSUM: cb4f38eaa6b1bdf86cfe440ef964c628e6d8321d
+PODFILE CHECKSUM: 40c4fc7dfb6066c4fdb80bc08600096e172dd4d7
 
 COCOAPODS: 1.5.3
diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
index 5074cd424..f08479b69 100644
--- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
@@ -52,6 +52,16 @@
                ReferencedContainer = "container:Signal.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B50508FED0E49769CFCF3F5D7B5FCD61"
+               BuildableName = "SignalServiceKit-Unit-Tests.xctest"
+               BlueprintName = "SignalServiceKit-Unit-Tests"
+               ReferencedContainer = "container:Pods/Pods.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
diff --git a/SignalServiceKit.podspec b/SignalServiceKit.podspec
index 2a8b7db6d..7eb74e7c6 100644
--- a/SignalServiceKit.podspec
+++ b/SignalServiceKit.podspec
@@ -57,4 +57,7 @@ An Objective-C library for communicating with the Signal messaging service.
   # > so we advise sticking with version 4 for the time being.
   s.dependency 'PromiseKit', "~> 4.0"
 
+  s.test_spec 'Tests' do |test_spec|
+    test_spec.source_files = 'SignalServiceKit/tests/**/*.{h,m,swift}'
+  end
 end
diff --git a/SignalServiceKit/tests/Devices/OWSReadReceiptTest.m b/SignalServiceKit/tests/Devices/OWSReadReceiptTest.m
deleted file mode 100644
index 3abab0f45..000000000
--- a/SignalServiceKit/tests/Devices/OWSReadReceiptTest.m
+++ /dev/null
@@ -1,30 +0,0 @@
-//  Created by Michael Kirk on 9/25/16.
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
-
-#import "OWSReadReceipt.h"
-#import <XCTest/XCTest.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface OWSReadReceiptTest : XCTestCase
-
-@end
-
-@implementation OWSReadReceiptTest
-
-- (void)testDontStoreEphemeralProperties
-{
-    OWSReadReceipt *readReceipt = [[OWSReadReceipt alloc] initWithSenderId:@"fake-sender-id" timestamp:1];
-
-    // Unfortunately this test will break every time you add, remove, or rename a property, but on the
-    // plus side it has a chance of catching when you indadvertently remove our ephemeral properties
-    // from our Mantle storage blacklist.
-    NSSet<NSString *> *expected = [NSSet setWithArray:@[ @"senderId", @"uniqueId", @"timestamp" ]];
-    NSSet<NSString *> *actual = [NSSet setWithArray:[readReceipt.dictionaryValue allKeys]];
-
-    XCTAssertEqualObjects(expected, actual);
-}
-
-@end
-
-NS_ASSUME_NONNULL_END