diff --git a/Signal/test/SignalBaseTest.m b/Signal/test/SignalBaseTest.m
index d07e8ab9c..d15bd17c8 100644
--- a/Signal/test/SignalBaseTest.m
+++ b/Signal/test/SignalBaseTest.m
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setUp
 {
-    NSLog(@"%@ setUp", self.logTag);
+    OWSLogInfo(@"");
 
     [super setUp];
 
@@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)tearDown
 {
-    NSLog(@"%@ tearDown", self.logTag);
+    OWSLogInfo(@"");
 
     [super tearDown];
 }
diff --git a/Signal/test/util/OWSDatabaseConverterTest.m b/Signal/test/util/OWSDatabaseConverterTest.m
index 60dfc24a1..c54518628 100644
--- a/Signal/test/util/OWSDatabaseConverterTest.m
+++ b/Signal/test/util/OWSDatabaseConverterTest.m
@@ -156,7 +156,7 @@ NS_ASSUME_NONNULL_BEGIN
         [self waitForExpectationsWithTimeout:5.0
                                      handler:^(NSError *error) {
                                          if (error) {
-                                             NSLog(@"Timeout Error: %@", error);
+                                             OWSLogInfo(@"Timeout Error: %@", error);
                                          }
                                      }];
     }
diff --git a/Signal/test/util/UtilTest.m b/Signal/test/util/UtilTest.m
index 23bcd21fa..548879d52 100644
--- a/Signal/test/util/UtilTest.m
+++ b/Signal/test/util/UtilTest.m
@@ -103,7 +103,7 @@
     NSDateFormatter *formatter = [NSDateFormatter new];
     formatter.dateStyle = NSDateFormatterLongStyle;
     formatter.timeStyle = NSDateFormatterLongStyle;
-    NSLog(@"now: %@", [formatter stringFromDate:now]);
+    OWSLogInfo(@"now: %@", [formatter stringFromDate:now]);
 
     NSDate *oneSecondAgo =
         [NSDate dateWithTimeIntervalSinceReferenceDate:[now timeIntervalSinceReferenceDate] - kSecondInterval];
@@ -135,7 +135,7 @@
     NSDate *twoYearsAhead =
         [NSDate dateWithTimeIntervalSinceReferenceDate:[now timeIntervalSinceReferenceDate] + kYearInterval * 2];
 
-    NSLog(@"oneSecondAgo: %@", [formatter stringFromDate:oneSecondAgo]);
+    OWSLogInfo(@"oneSecondAgo: %@", [formatter stringFromDate:oneSecondAgo]);
 
     XCTAssertTrue([DateUtil dateIsToday:oneSecondAgo now:now]);
     XCTAssertTrue([DateUtil dateIsToday:oneMinuteAgo now:now]);
@@ -236,13 +236,13 @@
     formatter.timeStyle = NSDateFormatterLongStyle;
 
     NSDate *yesterdayBeforeMidnight = [self dateWithYear:2015 month:8 day:10 hour:23 minute:55];
-    NSLog(@"yesterdayBeforeMidnight: %@", [formatter stringFromDate:yesterdayBeforeMidnight]);
+    OWSLogInfo(@"yesterdayBeforeMidnight: %@", [formatter stringFromDate:yesterdayBeforeMidnight]);
 
     NSDate *todayAfterMidnight = [self dateWithYear:2015 month:8 day:11 hour:0 minute:5];
-    NSLog(@"todayAfterMidnight: %@", [formatter stringFromDate:todayAfterMidnight]);
+    OWSLogInfo(@"todayAfterMidnight: %@", [formatter stringFromDate:todayAfterMidnight]);
 
     NSDate *todayNoon = [self dateWithYear:2015 month:8 day:11 hour:12 minute:0];
-    NSLog(@"todayNoon: %@", [formatter stringFromDate:todayNoon]);
+    OWSLogInfo(@"todayNoon: %@", [formatter stringFromDate:todayNoon]);
 
     // Before Midnight, after Midnight.
     XCTAssertFalse([DateUtil dateIsToday:yesterdayBeforeMidnight now:todayAfterMidnight]);
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.m b/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.m
index 5925468c4..06cd641f6 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.m
+++ b/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.m
@@ -12,27 +12,27 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)receivedOffer:(SSKProtoCallMessageOffer *)offer fromCallerId:(NSString *)callerId
 {
-    NSLog(@"%s", __PRETTY_FUNCTION__);
+    OWSLogInfo(@"");
 }
 
 - (void)receivedAnswer:(SSKProtoCallMessageAnswer *)answer fromCallerId:(NSString *)callerId
 {
-    NSLog(@"%s", __PRETTY_FUNCTION__);
+    OWSLogInfo(@"");
 }
 
 - (void)receivedIceUpdate:(SSKProtoCallMessageIceUpdate *)iceUpdate fromCallerId:(NSString *)callerId
 {
-    NSLog(@"%s", __PRETTY_FUNCTION__);
+    OWSLogInfo(@"");
 }
 
 - (void)receivedHangup:(SSKProtoCallMessageHangup *)hangup fromCallerId:(NSString *)callerId
 {
-    NSLog(@"%s", __PRETTY_FUNCTION__);
+    OWSLogInfo(@"");
 }
 
 - (void)receivedBusy:(SSKProtoCallMessageBusy *)busy fromCallerId:(NSString *)callerId
 {
-    NSLog(@"%s", __PRETTY_FUNCTION__);
+    OWSLogInfo(@"");
 }
 
 @end
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeContactsUpdater.m b/SignalServiceKit/src/TestUtils/OWSFakeContactsUpdater.m
index 3fc0a2431..9b3373777 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeContactsUpdater.m
+++ b/SignalServiceKit/src/TestUtils/OWSFakeContactsUpdater.m
@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 //- (nullable SignalRecipient *)synchronousLookup:(NSString *)identifier error:(NSError **)error
 //{
-//    NSLog(@"[OWSFakeContactsUpdater] Faking contact lookup.");
+//    OWSLogInfo(@"[OWSFakeContactsUpdater] Faking contact lookup.");
 //    return [[SignalRecipient alloc] initWithTextSecureIdentifier:@"fake-recipient-id"
 //                                                           relay:nil];
 //}
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeNotificationsManager.m b/SignalServiceKit/src/TestUtils/OWSFakeNotificationsManager.m
index 874275a00..8d47849d2 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeNotificationsManager.m
+++ b/SignalServiceKit/src/TestUtils/OWSFakeNotificationsManager.m
@@ -14,22 +14,22 @@ NS_ASSUME_NONNULL_BEGIN
                             inThread:(TSThread *)thread
                      contactsManager:(id<ContactsManagerProtocol>)contactsManager
                          transaction:(YapDatabaseReadTransaction *)transaction {
-    NSLog(@"%s", __PRETTY_FUNCTION__);
+    OWSLogInfo(@"");
 }
 
 - (void)notifyUserForErrorMessage:(TSErrorMessage *)error
                            thread:(TSThread *)thread
                       transaction:(YapDatabaseReadWriteTransaction *)transaction {
-    NSLog(@"%s", __PRETTY_FUNCTION__);
+    OWSLogInfo(@"");
 }
 
 - (void)notifyUserForThreadlessErrorMessage:(TSErrorMessage *)error
                                 transaction:(YapDatabaseReadWriteTransaction *)transaction {
-    NSLog(@"%s", __PRETTY_FUNCTION__);
+    OWSLogInfo(@"");
 }
 
 - (void)clearAllNotifications {
-    NSLog(@"%s", __PRETTY_FUNCTION__);
+    OWSLogInfo(@"");
 }
 
 @end
diff --git a/SignalServiceKit/tests/Devices/OWSDeviceProvisionerTest.m b/SignalServiceKit/tests/Devices/OWSDeviceProvisionerTest.m
index 15fa17fc7..b7e7a8378 100644
--- a/SignalServiceKit/tests/Devices/OWSDeviceProvisionerTest.m
+++ b/SignalServiceKit/tests/Devices/OWSDeviceProvisionerTest.m
@@ -20,7 +20,7 @@
                          success:(void (^)())successCallback
                          failure:(void (^)(NSError *))failureCallback
 {
-    NSLog(@"faking successful provisioning");
+    OWSLogInfo(@"faking successful provisioning");
     successCallback();
 }
 
@@ -35,7 +35,7 @@
 - (void)requestProvisioningCodeWithSuccess:(void (^)(NSString *))successCallback
                                    failure:(void (^)(NSError *))failureCallback
 {
-    NSLog(@"faking successful provisioning code fetching");
+    OWSLogInfo(@"faking successful provisioning code fetching");
     successCallback(@"fake-provisioning-code");
 }
 
@@ -90,7 +90,7 @@
     [self waitForExpectationsWithTimeout:5.0
                                  handler:^(NSError *error) {
                                      if (error) {
-                                         NSLog(@"Timeout Error: %@", error);
+                                         OWSLogInfo(@"Timeout Error: %@", error);
                                      }
                                  }];
 }
diff --git a/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m b/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
index 7bd77172f..4aad9499d 100644
--- a/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
+++ b/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
@@ -86,7 +86,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     [self waitForExpectationsWithTimeout:5
                                  handler:^(NSError *error) {
-                                     NSLog(@"No message submitted.");
+                                     OWSLogInfo(@"No message submitted.");
                                  }];
 }
 
diff --git a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
index 6881d79eb..ef03ec699 100644
--- a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
+++ b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
@@ -54,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
                                forRecipient:(SignalRecipient *)recipient
                                    inThread:(TSThread *)thread
 {
-    NSLog(@"[OWSFakeMessagesManager] Faking deviceMessages.");
+    OWSLogInfo(@"[OWSFakeMessagesManager] Faking deviceMessages.");
     return @[];
 }
 
@@ -298,7 +298,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     [self waitForExpectationsWithTimeout:5
                                  handler:^(NSError *error) {
-                                     NSLog(@"Expiration timer not set in time.");
+                                     OWSLogInfo(@"Expiration timer not set in time.");
                                  }];
 }
 
@@ -324,7 +324,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     [self waitForExpectationsWithTimeout:5
                                  handler:^(NSError *error) {
-                                     NSLog(@"Expiration timer not set in time.");
+                                     OWSLogInfo(@"Expiration timer not set in time.");
                                  }];
 }
 
diff --git a/SignalServiceKit/tests/SSKBaseTestObjC.m b/SignalServiceKit/tests/SSKBaseTestObjC.m
index f1f2bc026..bd7d85e0d 100644
--- a/SignalServiceKit/tests/SSKBaseTestObjC.m
+++ b/SignalServiceKit/tests/SSKBaseTestObjC.m
@@ -7,6 +7,9 @@
 #import "SSKEnvironment.h"
 #import "TestAppContext.h"
 
+@import CocoaLumberjack;
+#import <CocoaLumberjack/DDTTYLogger.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 #ifdef DEBUG
@@ -15,10 +18,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setUp
 {
-    NSLog(@"%@ setUp", self.logTag);
+    OWSLogInfo(@"%@ setUp", self.logTag);
 
     [super setUp];
 
+    [DDLog addLogger:DDTTYLogger.sharedInstance];
+
     ClearCurrentAppContextForTests();
     SetCurrentAppContext([TestAppContext new]);
 
@@ -27,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)tearDown
 {
-    NSLog(@"%@ tearDown", self.logTag);
+    OWSLogInfo(@"%@ tearDown", self.logTag);
 
     [super tearDown];
 }
diff --git a/SignalServiceKit/tests/SSKBaseTestSwift.swift b/SignalServiceKit/tests/SSKBaseTestSwift.swift
index 9334140fc..aa928b35a 100644
--- a/SignalServiceKit/tests/SSKBaseTestSwift.swift
+++ b/SignalServiceKit/tests/SSKBaseTestSwift.swift
@@ -4,6 +4,7 @@
 
 import XCTest
 import SignalServiceKit
+import CocoaLumberjack
 
 @objc
 public class SSKBaseTestSwift: XCTestCase {
@@ -12,6 +13,8 @@ public class SSKBaseTestSwift: XCTestCase {
     public override func setUp() {
         super.setUp()
 
+        DDLog.add(DDTTYLogger.sharedInstance)
+
         ClearCurrentAppContextForTests()
         SetCurrentAppContext(TestAppContext())