diff --git a/Source/Categories/NSManagedObjectContext+MagicalRecord.m b/Source/Categories/NSManagedObjectContext+MagicalRecord.m
index 35954cc..0fcb2ef 100644
--- a/Source/Categories/NSManagedObjectContext+MagicalRecord.m
+++ b/Source/Categories/NSManagedObjectContext+MagicalRecord.m
@@ -323,9 +323,8 @@ NSString * const kMagicalRecordDidMergeChangesFromiCloudNotification = @"kMagica
     (
          MRLog(@"Using Private queue mode");
        context = [[self alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
-       [context performBlockAndWait:^{
-            [context setPersistentStoreCoordinator:[NSPersistentStoreCoordinator MR_defaultStoreCoordinator]];
-        }];
+     [context setParentContext:[NSManagedObjectContext MR_defaultContext]];
+
     )
     
     return context;
diff --git a/Unit Tests/NSManagedObjectContextHelperTests.m b/Unit Tests/NSManagedObjectContextHelperTests.m
index 7efa334..82ce7d4 100644
--- a/Unit Tests/NSManagedObjectContextHelperTests.m	
+++ b/Unit Tests/NSManagedObjectContextHelperTests.m	
@@ -32,7 +32,12 @@
 {
     NSManagedObjectContext *testContext = [NSManagedObjectContext MR_contextThatNotifiesDefaultContextOnMainThread];
 
+    THREAD_ISOLATION_ENABLED(
     assertThatBool([testContext MR_notifiesMainContextOnSave], is(equalToBool(YES)));
+                             )
+    PRIVATE_QUEUES_ENABLED(
+               assertThat([testContext parentContext], is(equalTo([NSManagedObjectContext MR_defaultContext])));
+    )
 }