diff --git a/src/test/regress/bin/create_test.py b/src/test/regress/bin/create_test.py
index 572d64510..c6efde8d8 100755
--- a/src/test/regress/bin/create_test.py
+++ b/src/test/regress/bin/create_test.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
-import sys
-import random
 import os
+import random
+import sys
 
 if len(sys.argv) != 2:
     print(
diff --git a/src/test/regress/bin/diff-filter b/src/test/regress/bin/diff-filter
index 3908ca37f..e0a1f0aa7 100755
--- a/src/test/regress/bin/diff-filter
+++ b/src/test/regress/bin/diff-filter
@@ -5,8 +5,8 @@ diff-filter denormalizes diff output by having lines beginning with ' ' or '+'
 come from file2's unmodified version.
 """
 
-from sys import argv, stdin, stdout
 import re
+from sys import argv, stdin, stdout
 
 
 class FileScanner:
diff --git a/src/test/regress/citus_tests/arbitrary_configs/citus_arbitrary_configs.py b/src/test/regress/citus_tests/arbitrary_configs/citus_arbitrary_configs.py
index 2d07c0b63..1f509d479 100755
--- a/src/test/regress/citus_tests/arbitrary_configs/citus_arbitrary_configs.py
+++ b/src/test/regress/citus_tests/arbitrary_configs/citus_arbitrary_configs.py
@@ -12,21 +12,23 @@ Options:
     --seed=<seed>                   random number seed
     --base                          whether to use the base sql schedule or not
 """
+import os
+import shutil
 import sys
-import os, shutil
 
 # https://stackoverflow.com/questions/14132789/relative-imports-for-the-billionth-time/14132912#14132912
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-import common
-import config as cfg
 import concurrent.futures
 import multiprocessing
-from docopt import docopt
-import time
 import random
+import time
 
+import common
+from docopt import docopt
+
+import config as cfg
 
 testResults = {}
 parallel_thread_amount = 1
diff --git a/src/test/regress/citus_tests/common.py b/src/test/regress/citus_tests/common.py
index 1b8c69a45..d8fe9a8ee 100644
--- a/src/test/regress/citus_tests/common.py
+++ b/src/test/regress/citus_tests/common.py
@@ -1,9 +1,9 @@
-import os
-import shutil
-import sys
-import subprocess
 import atexit
 import concurrent.futures
+import os
+import shutil
+import subprocess
+import sys
 
 import utils
 from utils import USER, cd
diff --git a/src/test/regress/citus_tests/config.py b/src/test/regress/citus_tests/config.py
index 88b47be45..0ee8a1707 100644
--- a/src/test/regress/citus_tests/config.py
+++ b/src/test/regress/citus_tests/config.py
@@ -1,11 +1,12 @@
-from os.path import expanduser
+import inspect
+import os
 import random
 import socket
-from contextlib import closing
-import os
 import threading
+from contextlib import closing
+from os.path import expanduser
+
 import common
-import inspect
 
 COORDINATOR_NAME = "coordinator"
 WORKER1 = "worker1"
diff --git a/src/test/regress/citus_tests/run_test.py b/src/test/regress/citus_tests/run_test.py
index aba11156e..55811f4f8 100755
--- a/src/test/regress/citus_tests/run_test.py
+++ b/src/test/regress/citus_tests/run_test.py
@@ -1,14 +1,16 @@
 #!/usr/bin/env python3
 
-import sys
+import argparse
 import os
 import pathlib
-from glob import glob
-import argparse
-import shutil
 import random
 import re
+import shutil
+import sys
+from glob import glob
+
 import common
+
 import config
 
 args = argparse.ArgumentParser()
diff --git a/src/test/regress/citus_tests/upgrade/citus_upgrade_test.py b/src/test/regress/citus_tests/upgrade/citus_upgrade_test.py
index 5aa253913..7e55bb714 100755
--- a/src/test/regress/citus_tests/upgrade/citus_upgrade_test.py
+++ b/src/test/regress/citus_tests/upgrade/citus_upgrade_test.py
@@ -13,32 +13,30 @@ Options:
     --mixed                                 Run the verification phase with one node not upgraded.
 """
 
-import subprocess
 import atexit
 import os
 import re
+import subprocess
 import sys
 
 # https://stackoverflow.com/questions/14132789/relative-imports-for-the-billionth-time/14132912#14132912
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+import common
 import utils
+from docopt import docopt
 from utils import USER
 
-from docopt import docopt
-
 from config import (
-    CitusUpgradeConfig,
-    CITUS_VERSION_SQL,
-    MASTER_VERSION,
     AFTER_CITUS_UPGRADE_COORD_SCHEDULE,
     BEFORE_CITUS_UPGRADE_COORD_SCHEDULE,
+    CITUS_VERSION_SQL,
+    MASTER_VERSION,
     MIXED_AFTER_CITUS_UPGRADE_SCHEDULE,
     MIXED_BEFORE_CITUS_UPGRADE_SCHEDULE,
+    CitusUpgradeConfig,
 )
 
-import common
-
 
 def main(config):
     install_citus(config.pre_tar_path)
diff --git a/src/test/regress/citus_tests/upgrade/pg_upgrade_test.py b/src/test/regress/citus_tests/upgrade/pg_upgrade_test.py
index b7fc75a08..dd7c990af 100755
--- a/src/test/regress/citus_tests/upgrade/pg_upgrade_test.py
+++ b/src/test/regress/citus_tests/upgrade/pg_upgrade_test.py
@@ -10,23 +10,25 @@ Options:
     --pgxsdir=<pgxsdir>           	       Path to the PGXS directory(ex: ~/.pgenv/src/postgresql-11.3)
 """
 
-import sys, os
+import os
+import sys
 
 # https://stackoverflow.com/questions/14132789/relative-imports-for-the-billionth-time/14132912#14132912
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from config import (
-    PGUpgradeConfig,
-    AFTER_PG_UPGRADE_SCHEDULE,
-    BEFORE_PG_UPGRADE_SCHEDULE,
-)
-from docopt import docopt
-import utils
-from utils import USER
 import atexit
 import subprocess
 
 import common
+import utils
+from docopt import docopt
+from utils import USER
+
+from config import (
+    AFTER_PG_UPGRADE_SCHEDULE,
+    BEFORE_PG_UPGRADE_SCHEDULE,
+    PGUpgradeConfig,
+)
 
 
 def citus_prepare_pg_upgrade(pg_path, node_ports):
diff --git a/src/test/regress/citus_tests/utils.py b/src/test/regress/citus_tests/utils.py
index c9bfdc975..bbb0e3b83 100644
--- a/src/test/regress/citus_tests/utils.py
+++ b/src/test/regress/citus_tests/utils.py
@@ -1,6 +1,5 @@
-import subprocess
 import os
-
+import subprocess
 
 USER = "postgres"
 
diff --git a/src/test/regress/mitmscripts/fluent.py b/src/test/regress/mitmscripts/fluent.py
index 363af680e..f254d1bfa 100644
--- a/src/test/regress/mitmscripts/fluent.py
+++ b/src/test/regress/mitmscripts/fluent.py
@@ -1,20 +1,19 @@
-from collections import defaultdict
-from itertools import count
 import logging
-import re
 import os
+import queue
+import re
 import signal
 import socket
 import struct
 import threading
 import time
 import traceback
-import queue
-
-from construct.lib import ListContainer
-from mitmproxy import ctx, tcp
+from collections import defaultdict
+from itertools import count
 
 import structs
+from construct.lib import ListContainer
+from mitmproxy import ctx, tcp
 
 logging.basicConfig(format="%(asctime)s %(levelname)s %(message)s", level=logging.DEBUG)
 
diff --git a/src/test/regress/mitmscripts/structs.py b/src/test/regress/mitmscripts/structs.py
index 10ef25bc3..00208d23a 100644
--- a/src/test/regress/mitmscripts/structs.py
+++ b/src/test/regress/mitmscripts/structs.py
@@ -1,30 +1,30 @@
-from construct import (
-    Struct,
-    Int8ub,
-    Int16ub,
-    Int32ub,
-    Int16sb,
-    Int32sb,
-    Bytes,
-    CString,
-    Computed,
-    Switch,
-    Seek,
-    this,
-    Pointer,
-    GreedyRange,
-    Enum,
-    Byte,
-    Probe,
-    FixedSized,
-    RestreamData,
-    GreedyBytes,
-    Array,
-)
-import construct.lib as cl
-
 import re
 
+import construct.lib as cl
+from construct import (
+    Array,
+    Byte,
+    Bytes,
+    Computed,
+    CString,
+    Enum,
+    FixedSized,
+    GreedyBytes,
+    GreedyRange,
+    Int8ub,
+    Int16sb,
+    Int16ub,
+    Int32sb,
+    Int32ub,
+    Pointer,
+    Probe,
+    RestreamData,
+    Seek,
+    Struct,
+    Switch,
+    this,
+)
+
 # For all possible message formats see:
 # https://www.postgresql.org/docs/current/protocol-message-formats.html