diff --git a/oyster/tests/test_storage.py b/oyster/tests/test_storage.py
index 9e92540..d11da99 100644
--- a/oyster/tests/test_storage.py
+++ b/oyster/tests/test_storage.py
@@ -2,7 +2,6 @@ from nose.plugins.skip import SkipTest
 
 from oyster.conf import settings
 from oyster.core import Kernel
-from oyster.storage.s3 import S3Storage
 from oyster.storage.gridfs import GridFSStorage
 from oyster.storage.dummy import DummyStorage
 
@@ -24,8 +23,9 @@ def _simple_storage_test(StorageCls):
 
 
 def test_s3():
-    #if not hasattr(settings, 'AWS_BUCKET'):
-    #    raise SkipTest('S3 not configured')
+    if not hasattr(settings, 'AWS_BUCKET'):
+        raise SkipTest('S3 not configured')
+    from oyster.storage.s3 import S3Storage
     _simple_storage_test(S3Storage)