diff --git a/test/py/RunClientServer.py b/test/py/RunClientServer.py
index f345adf..db0814f 100755
--- a/test/py/RunClientServer.py
+++ b/test/py/RunClientServer.py
@@ -285,11 +285,13 @@
 
     generated_dirs = []
     for gp_dir in options.genpydirs.split(','):
-        if gp_dir == 'type_hints' and (sys.version_info < (3,7)):
-            print('Skipping \'type_hints\' test since python 3.7 or later is required')
+        if gp_dir == 'type_hints':
+            # Skip type hints tests -> See THRIFT-5885 (it might be related)
+            print('Skipping \'type_hints\' tests')
             continue
-        if gp_dir == 'enum' and (sys.version_info < (3,7)):
-            print('Skipping \'enum\' test since python 3.7 or later is required')
+        if gp_dir == 'enum':
+            # Skip enum tests -> See THRIFT-5885
+            print('Skipping \'enum\' tests')
             continue
         generated_dirs.append('gen-py-%s' % (gp_dir))