diff --git a/tests/invalid_models_tests/test_ordinary_fields.py b/tests/invalid_models_tests/test_ordinary_fields.py
index d14b907cdb..2c0a4d4672 100644
--- a/tests/invalid_models_tests/test_ordinary_fields.py
+++ b/tests/invalid_models_tests/test_ordinary_fields.py
@@ -1,13 +1,16 @@
 # -*- encoding: utf-8 -*-
 from __future__ import unicode_literals
 
+import unittest
+
 from django.core.checks import Error
 from django.core.exceptions import ImproperlyConfigured
-from django.db import models
+from django.db import connection, models
 
 from .base import IsolatedModelsTestCase
 
 
+
 class AutoFieldTests(IsolatedModelsTestCase):
 
     def test_valid_case(self):
@@ -176,6 +179,8 @@ class CharFieldTests(IsolatedModelsTestCase):
         ]
         self.assertEqual(errors, expected)
 
+    @unittest.skipUnless(connection.vendor == 'mysql',
+                         "Test valid only for MySQL")
     def test_too_long_char_field_under_mysql(self):
         from django.db.backends.mysql.validation import DatabaseValidation
 
diff --git a/tests/schema/tests.py b/tests/schema/tests.py
index 6e92d5b784..88388ac0b4 100644
--- a/tests/schema/tests.py
+++ b/tests/schema/tests.py
@@ -182,7 +182,8 @@ class SchemaTests(TransactionTestCase):
         # Ensure the field is right afterwards
         columns = self.column_classes(Author)
         self.assertEqual(columns['surname'][0], "CharField")
-        self.assertEqual(columns['surname'][1][6], False)
+        self.assertEqual(columns['surname'][1][6],
+                         connection.features.interprets_empty_strings_as_nulls)
 
     def test_alter(self):
         """