diff --git a/CDTDatastoreTests/Encryption/DatastoreEncryptionTests.m b/CDTDatastoreTests/Encryption/DatastoreEncryptionTests.m
index 5edb839fe..d63a667c5 100644
--- a/CDTDatastoreTests/Encryption/DatastoreEncryptionTests.m
+++ b/CDTDatastoreTests/Encryption/DatastoreEncryptionTests.m
@@ -45,7 +45,7 @@ - (void)testEncryptionKeyProviderReturnsTheSameProviderUsedToCreateTheDatastore
 
 - (void)testInitWithoutEncryptionKeyThrowsException
 {
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"datastoreEncryptionTests_exception"];
 
     TD_Database *db = [[TD_Database alloc] initWithPath:path];
@@ -61,7 +61,7 @@ - (void)testInitReturnsNilIfEncryptionKeyProviderReturnsAValueAndDBIsNotEncrypte
     // Create non-encrypted db
     CDTEncryptionKeyNilProvider *nilProvider = [CDTEncryptionKeyNilProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"datastoreEncryptionTests_nonEncryptDB"];
     [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:nilProvider];
 
@@ -119,7 +119,7 @@ - (void)testInitWithoutEncryptionKeyThrowsExceptionAlthoughDBIsAlreadyOpen
     // Create non-encrypted db
     CDTEncryptionKeyNilProvider *nilProvider = [CDTEncryptionKeyNilProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"datastoreEncryptionTests_alreadyOpen"];
     TD_Database *db = [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:nilProvider];
 
@@ -135,7 +135,7 @@ - (void)testInitReturnsNilIfEncryptionKeyProviderReturnsAValueWithAnAlreadyOpenN
     // Create non-encrypted db
     CDTEncryptionKeyNilProvider *nilProvider = [CDTEncryptionKeyNilProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"datastoreEncryptionTests_alreadyOpenNonEncryptDB"];
     TD_Database *db = [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:nilProvider];
 
@@ -155,7 +155,7 @@ - (void)testInitReturnsNilIfEncryptionKeyProviderDoesNotReturnTheKeyUsedToCipher
     // Create encrypted db
     CDTHelperFixedKeyProvider *fixedProvider = [CDTHelperFixedKeyProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"datastoreEncryptionTests_encryptDBWrongKey"];
     [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:fixedProvider];
 
@@ -176,7 +176,7 @@ - (void)testInitReturnsNilIfEncryptionKeyProviderReturnsNilWithAnAlreadyOpenEncr
     // Create encrypted db
     CDTHelperFixedKeyProvider *fixedProvider = [CDTHelperFixedKeyProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"datastoreEncryptionTests_alreadyOpenEncryptDB"];
     TD_Database *db =
         [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:fixedProvider];
@@ -195,7 +195,7 @@ - (void)testInitReturnsNilIfEncryptionKeyProviderDoesNotReturnTheKeyUsedToOpenTh
     // Create encrypted db
     CDTHelperFixedKeyProvider *fixedProvider = [CDTHelperFixedKeyProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"datastoreEncryptionTests_encryptDBWrongKey_again"];
     TD_Database *db =
         [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:fixedProvider];
diff --git a/CDTDatastoreTests/Encryption/TD_DatabaseEncryptionTests.m b/CDTDatastoreTests/Encryption/TD_DatabaseEncryptionTests.m
index df5f7fd7f..9f4aa1c21 100644
--- a/CDTDatastoreTests/Encryption/TD_DatabaseEncryptionTests.m
+++ b/CDTDatastoreTests/Encryption/TD_DatabaseEncryptionTests.m
@@ -17,12 +17,13 @@
 
 #import "CDTEncryptionKeyNilProvider.h"
 #import "CDTHelperFixedKeyProvider.h"
+#import "CloudantSyncTests.h"
 #import "CloudantTests+EncryptionTests.h"
 #import "FMDatabase+SQLCipher.h"
 
 #import "TD_Database.h"
 
-@interface TD_DatabaseEncryptionTests : CloudantTests
+@interface TD_DatabaseEncryptionTests : CloudantSyncTests
 
 @end
 
@@ -33,7 +34,7 @@ - (void)testCreateEmptyWithEncryptionKeyNilProviderDoesNotCipherDatabase
     // Create db
     CDTEncryptionKeyNilProvider *provider = [CDTEncryptionKeyNilProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_NilNotCipher"];
     [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:provider];
 
@@ -50,7 +51,7 @@ - (void)testCreateEmptyWithFixedKeyProviderFails
     // Create db
     CDTHelperFixedKeyProvider *provider = [CDTHelperFixedKeyProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_DoCipherDb"];
     TD_Database *db = [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:provider];
 
@@ -62,7 +63,7 @@ - (void)testCreateEmptyWithFixedKeyProviderFails
 - (void)testOpenFailsIfEncryptionKeyProviderReturnsAValue
 {
     CDTHelperFixedKeyProvider *provider = [CDTHelperFixedKeyProvider provider];
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_OpenFails"];
 
     TD_Database *db = [[TD_Database alloc] initWithPath:path];
@@ -88,7 +89,7 @@ - (void)testOpenFailsIfEncryptionKeyProviderReturnsAValueWithANonEncryptedDataba
     // Create non-encrypted db
     CDTEncryptionKeyNilProvider *nilProvider = [CDTEncryptionKeyNilProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_nonEncryptDB"];
     [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:nilProvider];
 
@@ -139,7 +140,7 @@ - (void)testReopenWithoutEncryptionKeyThrowsException
     // Create non-encrypted db
     CDTEncryptionKeyNilProvider *nilProvider = [CDTEncryptionKeyNilProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_reOpen"];
     TD_Database *db = [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:nilProvider];
 
@@ -153,7 +154,7 @@ - (void)testReopenFailsIfEncryptionKeyProviderReturnsAValueWithANonEncryptedData
     // Create non-encrypted db
     CDTEncryptionKeyNilProvider *nilProvider = [CDTEncryptionKeyNilProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_reOpenNonEncryptDB"];
     TD_Database *db = [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:nilProvider];
 
@@ -170,7 +171,7 @@ - (void)testCreateEmptyWithFixedKeyProviderCiphersDatabase
     // Create db
     CDTHelperFixedKeyProvider *provider = [CDTHelperFixedKeyProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_DoCipherDb"];
     [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:provider];
 
@@ -182,7 +183,7 @@ - (void)testCreateEmptyWithFixedKeyProviderCiphersDatabase
 - (void)testOpenDoesNotFailIfEncryptionKeyProviderReturnsAValue
 {
     CDTHelperFixedKeyProvider *provider = [CDTHelperFixedKeyProvider provider];
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_openNotFail"];
 
     TD_Database *db = [[TD_Database alloc] initWithPath:path];
@@ -196,7 +197,7 @@ - (void)testOpenFailsIfEncryptionKeyProviderDoesNotReturnTheKeyUsedToCipherTheDa
     // Create encrypted db
     CDTHelperFixedKeyProvider *fixedProvider = [CDTHelperFixedKeyProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_encryptDBWrongKey"];
     [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:fixedProvider];
 
@@ -215,7 +216,7 @@ - (void)testReopenFailsIfEncryptionKeyProviderReturnsNilWithAnEncryptedDatabase
     // Create encrypted db
     CDTHelperFixedKeyProvider *fixedProvider = [CDTHelperFixedKeyProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_reOpenEncryptDB"];
     TD_Database *db =
         [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:fixedProvider];
@@ -232,7 +233,7 @@ - (void)testReopenFailsIfEncryptionKeyProviderDoesNotReturnTheKeyUsedToCipherThe
     // Create encrypted db
     CDTHelperFixedKeyProvider *fixedProvider = [CDTHelperFixedKeyProvider provider];
 
-    NSString *path = [NSTemporaryDirectory()
+    NSString *path = [[self createTemporaryDirectoryAndReturnPath]
         stringByAppendingPathComponent:@"TD_DatabaseEncryptionTests_reOpenEncryptDBWrongKey"];
     TD_Database *db =
         [TD_Database createEmptyDBAtPath:path withEncryptionKeyProvider:fixedProvider];