diff --git a/common/djangoapps/static_replace/test/test_static_replace.py b/common/djangoapps/static_replace/test/test_static_replace.py
index e08c66c59f..63fc3eaa6a 100644
--- a/common/djangoapps/static_replace/test/test_static_replace.py
+++ b/common/djangoapps/static_replace/test/test_static_replace.py
@@ -24,15 +24,24 @@ def test_multi_replace():
     )
 
 
-@patch('static_replace.finders')
-@patch('static_replace.settings')
-def test_debug_no_modify(mock_settings, mock_finders):
-    mock_settings.DEBUG = True
-    mock_finders.find.return_value = True
+@patch('static_replace.staticfiles_storage')
+def test_storage_url_exists(mock_storage):
+    mock_storage.exists.return_value = True
+    mock_storage.url.return_value = '/static/file.png'
 
-    assert_equals(STATIC_SOURCE, replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY))
+    assert_equals('"/static/file.png"', replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY))
+    mock_storage.exists.called_once_with('file.png')
+    mock_storage.url.called_once_with('data_dir/file.png')
 
-    mock_finders.find.assert_called_once_with('file.png', True)
+
+@patch('static_replace.staticfiles_storage')
+def test_storage_url_not_exists(mock_storage):
+    mock_storage.exists.return_value = False
+    mock_storage.url.return_value = '/static/data_dir/file.png'
+
+    assert_equals('"/static/data_dir/file.png"', replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY))
+    mock_storage.exists.called_once_with('file.png')
+    mock_storage.url.called_once_with('file.png')
 
 
 @patch('static_replace.StaticContent')
@@ -58,7 +67,10 @@ def test_mongo_filestore(mock_modulestore, mock_static_content):
 @patch('static_replace.staticfiles_storage')
 def test_data_dir_fallback(mock_storage, mock_modulestore, mock_settings):
     mock_modulestore.return_value = Mock(XMLModuleStore)
-    mock_settings.DEBUG = False
     mock_storage.url.side_effect = Exception
 
+    mock_storage.exists.return_value = True
+    assert_equals('"/static/data_dir/file.png"', replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY))
+
+    mock_storage.exists.return_value = False
     assert_equals('"/static/data_dir/file.png"', replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY))