diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,14 @@
language: python
python:
  - "2.7"
  - "3.3"
  - "3.4"
  - "3.5"
  # - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details)
git:
  # a higher depth is needed for most of the tests - must be high enough to not actually be shallow
  # as we clone our own repository in the process
@@ -15,6 +19,7 @@ install:
  - git fetch --tags
  - pip install -r test-requirements.txt
  - pip install codecov sphinx

  # generate some reflog as git-python tests need it (in master)
  - ./init-tests-after-clone.sh

diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
@@ -3,7 +3,10 @@
import logging
import os
import stat
-from unittest.case import SkipTest
import uuid

import git

diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py
@@ -7,20 +7,24 @@

import contextlib
from functools import wraps
import io
import logging
import os
import tempfile
import textwrap
import time
-from unittest import TestCase
-import unittest

-from git.compat import string_types, is_win, PY3
from git.util import rmtree, cwd

import os.path as osp


ospd = osp.dirname

@@ -335,8 +339,11 @@ class TestBase(TestCase):
      of the project history ( to assure tests don't fail for others ).
    """

-    if not PY3:
-        assertRaisesRegex = unittest.TestCase.assertRaisesRegexp

    def _small_repo_url(self):
        """:return" a path to a small, clonable repository"""

diff --git a/git/test/test_base.py b/git/test/test_base.py
@@ -7,7 +7,10 @@
import os
import sys
import tempfile
-from unittest import skipIf

from git import (
    Blob,
@@ -131,7 +134,6 @@ def test_add_unicode(self, rw_repo):
        try:
            file_path.encode(sys.getfilesystemencoding())
        except UnicodeEncodeError:
-            from unittest import SkipTest
            raise SkipTest("Environment doesn't support unicode filenames")

        with open(file_path, "wb") as fp:

diff --git a/git/test/test_fun.py b/git/test/test_fun.py
@@ -1,6 +1,9 @@
from io import BytesIO
from stat import S_IFDIR, S_IFREG, S_IFLNK
-from unittest.case import skipIf

from git.compat import PY3
from git.index import IndexFile

diff --git a/git/test/test_remote.py b/git/test/test_remote.py
@@ -6,7 +6,10 @@

import random
import tempfile
-from unittest.case import skipIf

from git import (
    RemoteProgress,

diff --git a/git/test/test_repo.py b/git/test/test_repo.py
@@ -11,7 +11,10 @@
import pickle
import sys
import tempfile
-from unittest.case import skipIf

from git import (
    InvalidGitRepositoryError,
@@ -53,7 +56,6 @@
from git.util import HIDE_WINDOWS_KNOWN_ERRORS, cygpath
from git.test.lib import with_rw_directory
from git.util import join_path_native, rmtree, rmfile, bin_to_hex
-from unittest import SkipTest

import functools as fnt
import os.path as osp

diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
@@ -3,7 +3,10 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
import os
import sys
-from unittest.case import skipIf

import git
from git.cmd import Git

diff --git a/git/test/test_tree.py b/git/test/test_tree.py
@@ -6,7 +6,10 @@

from io import BytesIO
import sys
-from unittest.case import skipIf

from git import (
    Tree,

diff --git a/git/test/test_util.py b/git/test/test_util.py
@@ -6,7 +6,11 @@

import tempfile
import time
-from unittest.case import skipIf

import ddt


diff --git a/git/util.py b/git/util.py
@@ -11,11 +11,15 @@
import logging
import os
import platform
import re
import shutil
import stat
import time
-from unittest.case import SkipTest

from gitdb.util import (# NOQA @IgnorePep8
    make_sha,
@@ -303,7 +307,7 @@ def is_cygwin_git(git_executable):
    if not is_win:
        return False

-    from subprocess import check_output

    is_cygwin = _is_cygwin_cache.get(git_executable)
    if is_cygwin is None:
@@ -316,8 +320,11 @@ def is_cygwin_git(git_executable):

            ## Just a name given, not a real path.
            uname_cmd = osp.join(git_dir, 'uname')
-            uname = check_output(uname_cmd, universal_newlines=True)
-            is_cygwin = 'CYGWIN' in uname
        except Exception as ex:
            log.debug('Failed checking if running in CYGWIN due to: %r', ex)
        _is_cygwin_cache[git_executable] = is_cygwin

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
gitdb>=0.6.4
ddt>=1.1.1