diff --git a/tests/regressiontests/file_storage/tests.py b/tests/regressiontests/file_storage/tests.py
index 595b65d..74b6237 100644
--- a/tests/regressiontests/file_storage/tests.py
+++ b/tests/regressiontests/file_storage/tests.py
@@ -559,6 +559,9 @@ class InconsistentGetImageDimensionsBug(unittest.TestCase):
         self.assertEqual(size_1, size_2)
 
 class ContentFileTestCase(unittest.TestCase):
+    def setUp(self):
+        self.storage_dir = tempfile.mkdtemp()
+        self.storage = FileSystemStorage(self.storage_dir)
 
     def test_content_file_default_name(self):
         self.assertEqual(ContentFile(b"content").name, None)
@@ -577,6 +580,13 @@ class ContentFileTestCase(unittest.TestCase):
         """
         self.assertTrue(isinstance(ContentFile(b"content").read(), bytes))
         self.assertTrue(isinstance(ContentFile("español").read(), six.text_type))
+        
+    def test_content_saving(self):
+        """
+        Test that ContentFile can be saved correctly with the filesystem storage,
+        both if it was initialized with string or unicode content"""
+        self.storage.save('bytes.txt', ContentFile(b"content"))
+        self.storage.save('unicode.txt', ContentFile("español"))
 
 class NoNameFileTestCase(unittest.TestCase):
     """