diff --git a/auth_test.py b/auth_test.py
index 1f0dec102c..6332c2c02a 100644
--- a/auth_test.py
+++ b/auth_test.py
@@ -3,7 +3,7 @@
 import time
 from collections import namedtuple
 from datetime import datetime, timedelta
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 import re
 import pytest
 import logging
diff --git a/bootstrap_test.py b/bootstrap_test.py
index 4c09f0b7e1..885b357813 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -7,7 +7,7 @@
 import time
 import logging
 import signal
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 from cassandra import ConsistencyLevel
 from cassandra.concurrent import execute_concurrent_with_args
diff --git a/client_network_stop_start_test.py b/client_network_stop_start_test.py
index bc95ca5e74..a1caf92ef4 100644
--- a/client_network_stop_start_test.py
+++ b/client_network_stop_start_test.py
@@ -7,7 +7,7 @@
 import time
 
 from ccmlib.node import TimeoutError
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 from dtest import Tester
 from tools import sslkeygen
 
diff --git a/commitlog_test.py b/commitlog_test.py
index 54f217196d..1cf9da3d27 100644
--- a/commitlog_test.py
+++ b/commitlog_test.py
@@ -4,7 +4,7 @@
 import stat
 import struct
 import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 import pytest
 import logging
 
diff --git a/compaction_test.py b/compaction_test.py
index 2f7c62f3c0..c318303bd0 100644
--- a/compaction_test.py
+++ b/compaction_test.py
@@ -4,7 +4,7 @@
 import string
 import tempfile
 import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 import pytest
 import parse
 import logging
diff --git a/compression_test.py b/compression_test.py
index cb7fa88d0e..61dad24fea 100644
--- a/compression_test.py
+++ b/compression_test.py
@@ -3,7 +3,7 @@
 import logging
 
 from dtest import create_ks
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 from scrub_test import TestHelper
 from tools.assertions import assert_crc_check_chance_equal
 
diff --git a/configuration_test.py b/configuration_test.py
index 51bbab1fa7..7e43576c23 100644
--- a/configuration_test.py
+++ b/configuration_test.py
@@ -8,7 +8,7 @@
 
 from dtest import Tester, create_ks
 from tools.jmxutils import (JolokiaAgent, make_mbean)
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 logger = logging.getLogger(__name__)
 ported_to_in_jvm = pytest.mark.ported_to_in_jvm
diff --git a/conftest.py b/conftest.py
index dc7829ccd6..dcd5f47f94 100644
--- a/conftest.py
+++ b/conftest.py
@@ -10,7 +10,7 @@
 import shutil
 import time
 from datetime import datetime
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 # Python 3 imports
 from itertools import zip_longest
 
diff --git a/counter_test.py b/counter_test.py
index 2a9837d703..5638733fc2 100644
--- a/counter_test.py
+++ b/counter_test.py
@@ -10,7 +10,7 @@
 from tools.assertions import assert_invalid, assert_length_equal, assert_one
 from dtest import Tester, create_ks, create_cf, mk_bman_path
 from tools.data import rows_to_list
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 since = pytest.mark.since
 logger = logging.getLogger(__name__)
diff --git a/cql_test.py b/cql_test.py
index 30c5507d02..a6c0d4465d 100644
--- a/cql_test.py
+++ b/cql_test.py
@@ -13,7 +13,7 @@
 from cassandra.query import SimpleStatement
 
 from dtest import Tester, create_ks, mk_bman_path
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 from thrift_bindings.thrift010.ttypes import \
     ConsistencyLevel as ThriftConsistencyLevel
 from thrift_bindings.thrift010.ttypes import (CfDef, Column, ColumnOrSuperColumn,
diff --git a/cql_tracing_test.py b/cql_tracing_test.py
index 881557df12..72d53dea22 100644
--- a/cql_tracing_test.py
+++ b/cql_tracing_test.py
@@ -1,7 +1,7 @@
 import pytest
 import logging
 
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 from dtest import Tester, create_ks
 
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index ba19dc30df..af43338267 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -16,7 +16,7 @@
 
 import pytest
 from decimal import Decimal
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 from tempfile import NamedTemporaryFile
 from uuid import UUID, uuid4
 
diff --git a/cqlsh_tests/test_cqlsh_copy.py b/cqlsh_tests/test_cqlsh_copy.py
index 396de32e15..aeceaa997b 100644
--- a/cqlsh_tests/test_cqlsh_copy.py
+++ b/cqlsh_tests/test_cqlsh_copy.py
@@ -12,7 +12,7 @@
 import time
 from collections import namedtuple
 from decimal import Decimal
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 from tempfile import NamedTemporaryFile, gettempdir, template
 from uuid import uuid1, uuid4
 
diff --git a/dtest.py b/dtest.py
index 50ef420cf8..8170da484e 100644
--- a/dtest.py
+++ b/dtest.py
@@ -8,7 +8,7 @@
 import threading
 import time
 import traceback
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import pytest
 import cassandra
diff --git a/dtest_setup.py b/dtest_setup.py
index 23c9b2e581..712360cc5d 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -22,7 +22,7 @@
 
 from dtest import (get_ip_from_node, make_execution_profile, get_auth_provider, get_port_from_node,
                    get_eager_protocol_version, hack_legacy_parsing)
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 from tools.context import log_filter
 from tools.funcutils import merge_dicts
diff --git a/jmx_auth_test.py b/jmx_auth_test.py
index e5b3d03c28..8d8e742e64 100644
--- a/jmx_auth_test.py
+++ b/jmx_auth_test.py
@@ -2,7 +2,7 @@
 import string
 import pytest
 import logging
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 from ccmlib.node import ToolError
 from dtest import Tester
diff --git a/jmx_test.py b/jmx_test.py
index bc5f8b1277..4c2959eeab 100644
--- a/jmx_test.py
+++ b/jmx_test.py
@@ -8,7 +8,7 @@
 import ccmlib.common
 from ccmlib.node import ToolError
 
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 from dtest import Tester, create_ks
 from tools.jmxutils import (JolokiaAgent, enable_jmx_ssl, make_mbean)
diff --git a/json_test.py b/json_test.py
index 69b8b5a56a..bfb6e31320 100644
--- a/json_test.py
+++ b/json_test.py
@@ -7,7 +7,7 @@
 import pytest
 import logging
 
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 from ccmlib import common
 from ccmlib.common import is_win
diff --git a/materialized_views_test.py b/materialized_views_test.py
index a6c58c1f00..e6a5cc35cd 100644
--- a/materialized_views_test.py
+++ b/materialized_views_test.py
@@ -19,7 +19,7 @@
 from cassandra.cluster import Cluster
 from cassandra.query import SimpleStatement
 
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 from dtest import Tester, get_ip_from_node, create_ks, mk_bman_path
 from tools.assertions import (assert_all, assert_crc_check_chance_equal,
                               assert_invalid, assert_none, assert_one,
diff --git a/paging_test.py b/paging_test.py
index 971c7778a0..c2818eb87c 100644
--- a/paging_test.py
+++ b/paging_test.py
@@ -5,7 +5,7 @@
 
 from flaky import flaky
 
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 from cassandra import ConsistencyLevel as CL
 from cassandra import InvalidRequest, ReadFailure, ReadTimeout
diff --git a/pending_range_test.py b/pending_range_test.py
index 1e5451088e..bd6a7298a2 100644
--- a/pending_range_test.py
+++ b/pending_range_test.py
@@ -9,7 +9,7 @@
 
 from dtest import Tester, create_ks, mk_bman_path
 
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 logger = logging.getLogger(__name__)
 
diff --git a/pushed_notifications_test.py b/pushed_notifications_test.py
index 8b278ccfab..b0d1b27a50 100644
--- a/pushed_notifications_test.py
+++ b/pushed_notifications_test.py
@@ -3,7 +3,7 @@
 import logging
 
 from datetime import datetime
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 from threading import Event
 
 from cassandra import ConsistencyLevel as CL
diff --git a/read_repair_test.py b/read_repair_test.py
index 5a81e63938..fe487a34ae 100644
--- a/read_repair_test.py
+++ b/read_repair_test.py
@@ -2,7 +2,7 @@
 import glob
 import os
 import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import pytest
 import logging
diff --git a/repair_tests/deprecated_repair_test.py b/repair_tests/deprecated_repair_test.py
index 2b0fc0e258..2dc8df1db3 100644
--- a/repair_tests/deprecated_repair_test.py
+++ b/repair_tests/deprecated_repair_test.py
@@ -3,7 +3,7 @@
 import os
 import subprocess
 
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 from cassandra import ConsistencyLevel
 from ccmlib.common import is_win
diff --git a/repair_tests/incremental_repair_test.py b/repair_tests/incremental_repair_test.py
index d18b390dba..b933137ccb 100644
--- a/repair_tests/incremental_repair_test.py
+++ b/repair_tests/incremental_repair_test.py
@@ -1,5 +1,5 @@
 import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import pytest
 import re
diff --git a/replace_address_test.py b/replace_address_test.py
index 751f0b3f52..23d50f9b39 100644
--- a/replace_address_test.py
+++ b/replace_address_test.py
@@ -1,6 +1,6 @@
 import os
 import tempfile
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import pytest
 import logging
diff --git a/replication_test.py b/replication_test.py
index 7098afcd2a..90d0cc30c6 100644
--- a/replication_test.py
+++ b/replication_test.py
@@ -1,7 +1,7 @@
 import os
 import re
 import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import pytest
 import logging
diff --git a/requirements.txt b/requirements.txt
index e2b28eb185..60d766dc1f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@
 #
 # In case you want to test a patch with your own CCM branch, further to changing below CCM repo and branch name, you need to add -e flag at the beginning
 # Example: -e git+https://github.com/userb/ccm.git@cassandra-17182#egg=ccm
-git+https://github.com/apache/cassandra-ccm.git@cassandra-test#egg=ccm
+-e git+https://github.com/dkropachev/cassandra-ccm.git@dk/move-off-distutils-version#egg=ccm
 click==8.0.4
 decorator==5.1.1
 docopt==0.6.2
@@ -21,7 +21,7 @@ iniconfig==1.1.1
 lxml==5.1.0
 mock==5.1.0
 netifaces==0.11.0
-packaging==21.3
+packaging<21
 parse==1.20.1
 pluggy==1.0.0
 psutil==5.9.8
diff --git a/secondary_indexes_test.py b/secondary_indexes_test.py
index 1e14d636fd..eee7a02c82 100644
--- a/secondary_indexes_test.py
+++ b/secondary_indexes_test.py
@@ -3,7 +3,7 @@
 import re
 import time
 import uuid
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import pytest
 import logging
diff --git a/snapshot_test.py b/snapshot_test.py
index 2a72b98d7f..ba1b04f66b 100644
--- a/snapshot_test.py
+++ b/snapshot_test.py
@@ -4,7 +4,7 @@
 import shutil
 import subprocess
 import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import pytest
 import logging
diff --git a/sstable_generation_loading_test.py b/sstable_generation_loading_test.py
index 490d1254c8..7e9291d96d 100644
--- a/sstable_generation_loading_test.py
+++ b/sstable_generation_loading_test.py
@@ -2,7 +2,7 @@
 import subprocess
 import time
 import distutils.dir_util
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import pytest
 import logging
diff --git a/topology_test.py b/topology_test.py
index e1b8908251..81074e3e04 100644
--- a/topology_test.py
+++ b/topology_test.py
@@ -1,6 +1,6 @@
 import re
 import time
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import pytest
 import logging
diff --git a/ttl_test.py b/ttl_test.py
index c7ee5d9a79..5fc171ae24 100644
--- a/ttl_test.py
+++ b/ttl_test.py
@@ -6,7 +6,7 @@
 import logging
 
 from collections import OrderedDict
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 from cassandra import ConsistencyLevel, InvalidRequest
 from cassandra.query import SimpleStatement
diff --git a/upgrade_tests/cql_tests.py b/upgrade_tests/cql_tests.py
index e821585948..2712ccc8f1 100644
--- a/upgrade_tests/cql_tests.py
+++ b/upgrade_tests/cql_tests.py
@@ -7,7 +7,7 @@
 import logging
 
 from collections import OrderedDict
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 from uuid import UUID, uuid4
 
 from cassandra import ConsistencyLevel, InvalidRequest
diff --git a/upgrade_tests/upgrade_base.py b/upgrade_tests/upgrade_base.py
index 6f5326d46a..6b2f53ed74 100644
--- a/upgrade_tests/upgrade_base.py
+++ b/upgrade_tests/upgrade_base.py
@@ -1,4 +1,4 @@
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import logging
 import pytest
diff --git a/upgrade_tests/upgrade_supercolumns_test.py b/upgrade_tests/upgrade_supercolumns_test.py
index 6f6aad7410..a4ed85b312 100644
--- a/upgrade_tests/upgrade_supercolumns_test.py
+++ b/upgrade_tests/upgrade_supercolumns_test.py
@@ -1,4 +1,4 @@
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import os
 import pytest
diff --git a/upgrade_tests/upgrade_through_versions_test.py b/upgrade_tests/upgrade_through_versions_test.py
index b27a0a42ad..c9b79ed001 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -1,4 +1,4 @@
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 import logging
 import operator
diff --git a/upgrade_tests/upgrade_udtfix_test.py b/upgrade_tests/upgrade_udtfix_test.py
index dfb384cbfe..ea2eef3c9e 100644
--- a/upgrade_tests/upgrade_udtfix_test.py
+++ b/upgrade_tests/upgrade_udtfix_test.py
@@ -2,7 +2,7 @@
 import logging
 
 from dtest import Tester
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 from tools.misc import add_skip
 from .upgrade_manifest import build_upgrade_pairs, CASSANDRA_3_0, RUN_STATIC_UPGRADE_MATRIX
 
diff --git a/user_functions_test.py b/user_functions_test.py
index d0676019eb..e1c25273b4 100644
--- a/user_functions_test.py
+++ b/user_functions_test.py
@@ -3,7 +3,7 @@
 import pytest
 import logging
 
-from distutils.version import LooseVersion
+from ccmlib.version import LooseVersion
 
 from cassandra import FunctionFailure