diff --git a/.travis.yml b/.travis.yml
index 4f68bd819..9011cf891 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,11 @@ jobs:
       services:
         - postgresql
     - python: 3.6
-      env: TOXENV=py36-dj111-sqlite-coverage
-    - python: 2.7
-      env: TOXENV=py27-dj111-mysql_innodb-coverage
+      env: TOXENV=py36-dj111-mysql_innodb-coverage
       services:
         - mysql
+    - python: 2.7
+      env: TOXENV=py27-dj111-sqlite-xdist-coverage
     - python: 3.6
       env: TOXENV=checkqa,docs
 
diff --git a/tests/test_db_setup.py b/tests/test_db_setup.py
index b5fc78b26..cc8353c08 100644
--- a/tests/test_db_setup.py
+++ b/tests/test_db_setup.py
@@ -278,7 +278,10 @@ def test_a():
 
                 assert conn_default.vendor == 'sqlite'
                 db_name = conn_default.creation._get_test_db_name()
-                assert 'file:memorydb' in db_name
+                if conn_default.features.can_share_in_memory_db:
+                    assert 'file:memorydb' in db_name
+                else:
+                    assert db_name == ":memory:"
 
                 assert conn_db2.vendor == 'sqlite'
                 db_name = conn_db2.creation._get_test_db_name()
diff --git a/tox.ini b/tox.ini
index ad71b6c54..37b1bc398 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,8 +19,8 @@ deps =
     dj19: Django>=1.9,<1.10
     dj18: Django>=1.8,<1.9
 
-    mysql_myisam: mysql-python==1.2.5
-    mysql_innodb: mysql-python==1.2.5
+    mysql_myisam: mysqlclient==1.4.2.post1
+    mysql_innodb: mysqlclient==1.4.2.post1
 
     postgres: psycopg2-binary
     coverage: coverage-enable-subprocess