diff --git a/tests/bwc/test_recovery.py b/tests/bwc/test_recovery.py
index 34a2c660..cea19d1f 100644
--- a/tests/bwc/test_recovery.py
+++ b/tests/bwc/test_recovery.py
@@ -24,7 +24,9 @@
     UpgradePath('5.6.x', '5.7.x'),
     UpgradePath('5.7.x', '5.8.x'),
     UpgradePath('5.8.x', '5.9.x'),
-    UpgradePath('5.9.x', 'latest-nightly')
+    UpgradePath('5.9.x', '5.10.x'),
+    UpgradePath('5.10.x', '6.0.x'),
+    UpgradePath('6.0.x', 'latest-nightly')
 ]
 UPGRADE_PATHS_FROM_43 = [UpgradePath('4.3.x', '4.4.x')]
 
diff --git a/tests/bwc/test_rolling_upgrade.py b/tests/bwc/test_rolling_upgrade.py
index ce31ff0c..53fa50e9 100644
--- a/tests/bwc/test_rolling_upgrade.py
+++ b/tests/bwc/test_rolling_upgrade.py
@@ -40,8 +40,8 @@
     UpgradePath('5.7.x', '5.8.x'),
     UpgradePath('5.8.x', '5.9.x'),
     UpgradePath('5.9.x', '5.10.x'),
-    UpgradePath('5.10.x', '5.10'),
-    UpgradePath('5.10', 'latest-nightly'),
+    UpgradePath('5.10.x', '6.0.x'),
+    UpgradePath('6.0.x', 'latest-nightly'),
 )
 
 
diff --git a/tests/bwc/test_upgrade.py b/tests/bwc/test_upgrade.py
index 199eee8d..c5e087b2 100644
--- a/tests/bwc/test_upgrade.py
+++ b/tests/bwc/test_upgrade.py
@@ -58,7 +58,7 @@
         VersionDef('5.8.x', []),
         VersionDef('5.9.x', []),
         VersionDef('5.10.x', []),
-        VersionDef('5.10', []),
+        VersionDef('6.0.x', []),
         VersionDef('latest-nightly', [])
     )
 )
@@ -160,7 +160,7 @@ def run_selects(c, version):
 
 def get_test_paths():
     """
-    Generater for all possible upgrade paths that should be tested.
+    Generator for all possible upgrade paths that should be tested.
     """
     for path in UPGRADE_PATHS:
         for versions in (path[x:] for x in range(len(path) - 1)):