diff --git a/.circleci/config.yml b/.circleci/config.yml
index 539e53df7bb..fbb2396d3a8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,7 +42,6 @@ commonSteps: &commonSteps
           fi
           # Install lit
           python3 --version
-          python3 -m pip install --user setuptools wheel
           python3 -m pip install --user lit
           python3 -c "import lit.main; lit.main.main();" --version . | head -n 1
           # Download & extract host LDC if HOST_LDC_VERSION is set
diff --git a/.cirrus.yml b/.cirrus.yml
index 91442b34abb..6d7c373f989 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,8 +4,7 @@
 common_steps_template: &COMMON_STEPS_TEMPLATE
   install_lit_script: |
     # Install lit
-    rm -f /usr/lib/python3.11/EXTERNALLY-MANAGED # required for Ubuntu 23.04
-    python3 -m pip install --user setuptools wheel
+    rm -f /usr/lib/python3.12/EXTERNALLY-MANAGED # required for Ubuntu 24.04
     python3 -m pip install --user lit
     python3 -c "import lit.main; lit.main.main();" --version . | head -n 1
   clone_submodules_script: |
diff --git a/.github/actions/1-setup/action.yml b/.github/actions/1-setup/action.yml
index 90ef3cf151b..3263ed0dedd 100644
--- a/.github/actions/1-setup/action.yml
+++ b/.github/actions/1-setup/action.yml
@@ -122,9 +122,8 @@ runs:
         set -euxo pipefail
         python3 --version
         if [[ '${{ runner.os }}-${{ inputs.arch }}' == 'macOS-arm64' ]]; then
-          brew install lit python-setuptools
+          brew install lit
         else
-          python3 -m pip install --user setuptools wheel
           python3 -m pip install --user lit
         fi
         python3 -c "import lit.main; lit.main.main();" --version . | head -n 1
diff --git a/.github/workflows/supported_llvm_versions.yml b/.github/workflows/supported_llvm_versions.yml
index 234c192f92f..e6c3c6f547c 100644
--- a/.github/workflows/supported_llvm_versions.yml
+++ b/.github/workflows/supported_llvm_versions.yml
@@ -58,9 +58,8 @@ jobs:
         run: |
           set -euxo pipefail
           if [[ '${{ matrix.os }}' == 'macos-14' ]]; then
-            brew install lit python-setuptools
+            brew install lit
           else
-            python3 -m pip install --user setuptools wheel
             python3 -m pip install --user lit
           fi
           python3 -c "import lit.main; lit.main.main();" --version . | head -n 1
diff --git a/tests/debuginfo/print_gdb.d b/tests/debuginfo/print_gdb.d
index 200a74c6c74..589ffc9f12e 100644
--- a/tests/debuginfo/print_gdb.d
+++ b/tests/debuginfo/print_gdb.d
@@ -1,5 +1,4 @@
-// REQUIRES: atleast_gdb80
-
+// REQUIRES: gdb
 // This test fails due to newer version of GDB, see https://github.com/ldc-developers/ldc/issues/4389
 // XFAIL: FreeBSD
 
diff --git a/tests/lit.site.cfg.in b/tests/lit.site.cfg.in
index b9c723803f8..532a6316eca 100644
--- a/tests/lit.site.cfg.in
+++ b/tests/lit.site.cfg.in
@@ -7,7 +7,6 @@ import string
 import re
 import subprocess
 import glob
-from distutils.version import LooseVersion
 
 # Cmake Boolean options
 ON = True
@@ -203,19 +202,14 @@ if (platform.system() == 'Windows') and os.path.isfile( cdb ):
 # Check whether GDB is present
 if (platform.system() != 'Windows') and lit.util.which('gdb', config.environment['PATH']):
     config.available_features.add('gdb')
-    gdb_dflags = ''
-    command = ['gdb', '--version']
-    p = subprocess.Popen(command, stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE, universal_newlines=True)
-    text = p.stdout.readline()
-    m = re.compile('[^0-9]*([0-9]+[0-9.]*).*').match(text)
-    if m is not None:
-        gdb_version = m.group(1)
-        if LooseVersion(gdb_version) < LooseVersion('7.8'):
-            gdb_dflags = '-dwarf-version=2'
-        elif LooseVersion(gdb_version) >= LooseVersion('8.0'):
-            config.available_features.add('atleast_gdb80')
-
+    gdb_dflags = '' # for gdb-version-dependant flags
+    #command = ['gdb', '--version']
+    #p = subprocess.Popen(command, stdout=subprocess.PIPE,
+    #        stderr=subprocess.PIPE, universal_newlines=True)
+    #text = p.stdout.readline()
+    #m = re.compile('[^0-9]*([0-9]+[0-9.]*).*').match(text)
+    #if m is not None:
+    #    gdb_version = m.group(1)
     config.substitutions.append( ('%_gdb_dflags', gdb_dflags) )
 
 if 'LD_LIBRARY_PATH' in os.environ: