diff --git a/tests/test_feedexport.py b/tests/test_feedexport.py
index 520ca4a8f..e8c32ea43 100644
--- a/tests/test_feedexport.py
+++ b/tests/test_feedexport.py
@@ -237,7 +237,7 @@ class S3FeedStorageTest(unittest.TestCase):
         self.assertEqual(storage.secret_key, 'secret_key')
         self.assertEqual(storage.acl, 'custom-acl')
 
-    def test_store_in_thread_botocore_without_acl(self):
+    def test_store_botocore_without_acl(self):
         storage = S3FeedStorage(
             's3://mybucket/export.csv',
             'access_key',
@@ -247,13 +247,19 @@ class S3FeedStorageTest(unittest.TestCase):
         self.assertEqual(storage.secret_key, 'secret_key')
         self.assertEqual(storage.acl, None)
 
+        def _defer(f, *args, **kwargs):
+            return f(*args, **kwargs)
+
         with mock.patch('botocore.client.BaseClient._make_api_call') as m:
-            storage._store_in_thread(BytesIO(b'test file'))
+            with mock.patch('twisted.internet.threads.deferToThread',
+                            new=_defer):
+                storage.store(BytesIO(b'test file'))
+
             operation_name, api_params = m.call_args[0]
             self.assertEqual(operation_name, 'PutObject')
             self.assertNotIn('ACL', api_params)
 
-    def test_store_in_thread_botocore_with_acl(self):
+    def test_store_botocore_with_acl(self):
         storage = S3FeedStorage(
             's3://mybucket/export.csv',
             'access_key',
@@ -264,13 +270,19 @@ class S3FeedStorageTest(unittest.TestCase):
         self.assertEqual(storage.secret_key, 'secret_key')
         self.assertEqual(storage.acl, 'custom-acl')
 
+        def _defer(f, *args, **kwargs):
+            return f(*args, **kwargs)
+
         with mock.patch('botocore.client.BaseClient._make_api_call') as m:
-            storage._store_in_thread(BytesIO(b'test file'))
+            with mock.patch('twisted.internet.threads.deferToThread',
+                            new=_defer):
+                storage.store(BytesIO(b'test file'))
+
             operation_name, api_params = m.call_args[0]
             self.assertEqual(operation_name, 'PutObject')
             self.assertEqual(api_params.get('ACL'), 'custom-acl')
 
-    def test_store_in_thread_not_botocore_without_acl(self):
+    def test_store_not_botocore_without_acl(self):
         storage = S3FeedStorage(
             's3://mybucket/export.csv',
             'access_key',
@@ -284,7 +296,11 @@ class S3FeedStorageTest(unittest.TestCase):
         storage.connect_s3 = mock.MagicMock()
         self.assertFalse(storage.is_botocore)
 
-        storage._store_in_thread(BytesIO(b'test file'))
+        def _defer(f, *args, **kwargs):
+            return f(*args, **kwargs)
+
+        with mock.patch('twisted.internet.threads.deferToThread', new=_defer):
+            storage.store(BytesIO(b'test file'))
 
         conn = storage.connect_s3(*storage.connect_s3.call_args)
         bucket = conn.get_bucket(*conn.get_bucket.call_args)
@@ -294,7 +310,7 @@ class S3FeedStorageTest(unittest.TestCase):
             key.set_contents_from_file.call_args
         )
 
-    def test_store_in_thread_not_botocore_with_acl(self):
+    def test_store_not_botocore_with_acl(self):
         storage = S3FeedStorage(
             's3://mybucket/export.csv',
             'access_key',
@@ -309,7 +325,11 @@ class S3FeedStorageTest(unittest.TestCase):
         storage.connect_s3 = mock.MagicMock()
         self.assertFalse(storage.is_botocore)
 
-        storage._store_in_thread(BytesIO(b'test file'))
+        def _defer(f, *args, **kwargs):
+            return f(*args, **kwargs)
+
+        with mock.patch('twisted.internet.threads.deferToThread', new=_defer):
+            storage.store(BytesIO(b'test file'))
 
         conn = storage.connect_s3(*storage.connect_s3.call_args)
         bucket = conn.get_bucket(*conn.get_bucket.call_args)