  from django.test import TestCase, TransactionTestCase
  from django.test.runner import default_test_processes
  from django.test.selenium import SeleniumTestCaseBase
  from django.test.utils import get_runner
  from django.utils import six
  from django.utils._os import upath
  from django.utils.deprecation import (
      RemovedInDjango21Warning, RemovedInDjango30Warning,
  )
  from django.utils.log import DEFAULT_LOGGING
 
</s> remove from django.utils import six
 </s> add  </s> remove from django.utils import six
 </s> add  </s> remove from django.utils.six import text_type
 </s> add  </s> remove from django.utils import six
 </s> add  </s> remove from django.utils import six
 </s> add 
  from django.test import TestCase, TransactionTestCase
  from django.test.runner import default_test_processes
  from django.test.selenium import SeleniumTestCaseBase
  from django.test.utils import get_runner

  from django.utils._os import upath
  from django.utils.deprecation import (
      RemovedInDjango21Warning, RemovedInDjango30Warning,
  )
  from django.utils.log import DEFAULT_LOGGING
keep keep keep keep replace keep keep keep keep keep
 Refs #23919 -- Removed six.<various>_types usage

Thanks Tim Graham and Simon Charette for the reviews. 
tests/runtests.py