diff --git a/SignalMessaging/Payments/MobileCoinAPI.swift b/SignalMessaging/Payments/MobileCoinAPI.swift
index 5f28e327d1..c0e36a6958 100644
--- a/SignalMessaging/Payments/MobileCoinAPI.swift
+++ b/SignalMessaging/Payments/MobileCoinAPI.swift
@@ -78,7 +78,8 @@ class MobileCoinAPI: Dependencies {
     // MARK: -
 
     public static func configureSDKLogging() {
-        if DebugFlags.internalLogging {
+        if DebugFlags.internalLogging,
+           !CurrentAppContext().isRunningTests {
             MobileCoinLogging.logSensitiveData = true
         }
     }
diff --git a/SignalServiceKit/src/Payments/TSPaymentModels.swift b/SignalServiceKit/src/Payments/TSPaymentModels.swift
index 2871f9d50f..9ee9a69e5f 100644
--- a/SignalServiceKit/src/Payments/TSPaymentModels.swift
+++ b/SignalServiceKit/src/Payments/TSPaymentModels.swift
@@ -328,6 +328,9 @@ public class TSPaymentModels: NSObject {
     @objc(parsePaymentProtosInDataMessage:thread:)
     public class func parsePaymentProtos(dataMessage: SSKProtoDataMessage,
                                          thread: TSThread) -> TSPaymentModels? {
+        guard !CurrentAppContext().isRunningTests else {
+            return nil
+        }
         guard payments.arePaymentsEnabled else {
             return nil
         }