diff --git a/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m b/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
index e956d485b..b5b70bdc9 100644
--- a/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
+++ b/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
@@ -4,8 +4,8 @@
 
 #import "NSDate+millisecondTimeStamp.h"
 #import "TSAttachmentStream.h"
+#import "TSContactThread.h"
 #import "TSMessage.h"
-#import "TSThread.h"
 
 #import <XCTest/XCTest.h>
 
@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setUp {
     [super setUp];
-    self.thread = [[TSThread alloc] init];
+    self.thread = [TSContactThread getOrCreateThreadWithContactId:@"fake-thread-id"];
 }
 
 - (void)tearDown {
diff --git a/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m b/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m
index 1fe22aedc..fc10ce797 100644
--- a/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m
+++ b/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m
@@ -4,9 +4,9 @@
 
 #import "NSDate+millisecondTimeStamp.h"
 #import "OWSDisappearingMessagesFinder.h"
+#import "TSContactThread.h"
 #import "TSMessage.h"
 #import "TSStorageManager.h"
-#import "TSThread.h"
 #import <XCTest/XCTest.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -39,8 +39,8 @@ NS_ASSUME_NONNULL_BEGIN
 
     self.storageManager = [TSStorageManager sharedManager];
     self.dbConnection = self.storageManager.newDatabaseConnection;
-    self.thread = [TSThread new];
-    [self.thread save];
+    self.thread = [TSContactThread getOrCreateThreadWithContactId:@"fake-thread-id"];
+
     self.now = [NSDate ows_millisecondTimeStamp];
 
     // Test subject
diff --git a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
index a5ea22944..41677ec8e 100644
--- a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
+++ b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
@@ -7,9 +7,9 @@
 #import "OWSDisappearingMessagesFinder.h"
 #import "OWSDisappearingMessagesJob.h"
 #import "OWSFakeContactsManager.h"
+#import "TSContactThread.h"
 #import "TSMessage.h"
 #import "TSStorageManager.h"
-#import "TSThread.h"
 #import <XCTest/XCTest.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)testRemoveAnyExpiredMessage
 {
-    TSThread *thread = [TSThread new];
+    TSThread *thread = [TSContactThread getOrCreateThreadWithContactId:@"fake-thread-id"];
     uint64_t now = [NSDate ows_millisecondTimeStamp];
     TSMessage *expiredMessage1 = [[TSMessage alloc] initWithTimestamp:1
                                                              inThread:thread
@@ -84,7 +84,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)testBecomeConsistentWithMessageConfiguration
 {
-    TSThread *thread = [[TSThread alloc] initWithUniqueId:@"fake-thread-id"];
+    TSThread *thread = [TSContactThread getOrCreateThreadWithContactId:@"fake-thread-id"];
     [thread save];
 
     OWSDisappearingMessagesJob *job = [OWSDisappearingMessagesJob sharedJob];
@@ -111,7 +111,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)testBecomeConsistentWithUnexpiringMessageConfiguration
 {
-    TSThread *thread = [[TSThread alloc] initWithUniqueId:@"fake-thread-id"];
+    TSThread *thread = [TSContactThread getOrCreateThreadWithContactId:@"fake-thread-id"];
     [thread save];
 
     OWSDisappearingMessagesConfiguration *configuration =