diff --git a/bindep/tests/test_depends.py b/bindep/tests/test_depends.py
index 4f86986..01ca29d 100644
--- a/bindep/tests/test_depends.py
+++ b/bindep/tests/test_depends.py
@@ -54,12 +54,18 @@ class DistroFixture(fixtures.Fixture):
         self.distro_name = distro_name.lower()
 
     def _setUp(self):
+        # Python 2.7 and 3.5 need older distro which has different src paths
+        if distro.__version__ < '1.7.0':
+            distro_patch_path = 'distro._distro'
+        else:
+            distro_patch_path = 'distro.distro._distro'
         # This type of monkey patching is borrowed from the distro test
         # suite.
         os_release = os.path.join(FIXTURE_DIR, self.distro_name,
                                   'etc', 'os-release')
         mydistro = distro.LinuxDistribution(False, os_release, 'non')
-        self.useFixture(fixtures.MonkeyPatch('distro._distro', mydistro))
+        self.useFixture(
+            fixtures.MonkeyPatch(distro_patch_path, mydistro))
         if self.distro_name not in ['darwin']:
             self.useFixture(fixtures.MonkeyPatch(
                 'platform.system', lambda *x: 'Linux'))
diff --git a/requirements.txt b/requirements.txt
index 18ad23b..2431d42 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
-distro
+distro<1.7.0 ; python_version < '3.6'
+distro>=1.7.0 ; python_version >= '3.6'
 pbr>=2.0.0  # Apache-2.0
 Parsley
 packaging ; python_version >= '3.6'