diff --git a/pytest.ini b/pytest.ini
index e2a675022..b306940c7 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,9 +2,59 @@
 filterwarnings =
     ignore:Version mismatch between client .*
 testpaths =
+    tests/array_api/array_creation.py
+    tests/array_api/array_manipulation.py
+    tests/array_api/binary_ops.py
+    tests/array_api/indexing.py
+    tests/array_api/searching_functions.py
+    tests/array_api/set_functions.py
+    tests/array_api/sorting.py
+    tests/array_api/stats_functions.py
+    tests/array_api/util_functions.py
+    tests/alignment_test.py
+    tests/bigint_agg_test.py
+    tests/bitops_test.py
+    tests/categorical_test.py
+    tests/check.py
     tests/client_dtypes_test.py
-    tests/client_test.py
+    tests/coargsort_test.py
+    tests/dataframe_test.py
+    tests/datetime_test.py
+    tests/extrema_test.py
+    tests/groupby_test.py
+    tests/indexing_test.py
+    tests/index_test.py
+    tests/io_test.py
+    tests/io_util_test.py
+    tests/join_test.py
+    tests/logger_test.py
+    tests/message_test.py
     tests/numpy/dtypes_test.py
+    tests/numpy/manipulation_functions_test.py
+    tests/numpy/numeric_test.py
+    tests/numpy/numpy_test.py
+    tests/numpy/random_test.py
+    tests/operator_test.py
+    tests/pdarray_creation_test.py
+    tests/pdarrayclass_test.py
+    tests/regex_test.py
+    tests/scipy/scipy_test.py
+    tests/security_test.py
+    tests/segarray_test.py
+    tests/series_test.py
+    tests/setops_test.py
+    tests/sort_test.py
+    tests/sparse_test.py
+    tests/stats_test.py
+    tests/string_test.py
+    tests/symbol_table_test.py
+    tests/testing/asserters_test.py
+    tests/util_test.py
+    tests/where_test.py
+
+
+    # run client test last to avoid late disconnect issue
+    tests/client_test.py
 norecursedirs =
     .git
     dist
diff --git a/tests/client_test.py b/tests/client_test.py
index 7ebaffbd2..8d7e011e3 100644
--- a/tests/client_test.py
+++ b/tests/client_test.py
@@ -189,6 +189,4 @@ def test_client_nd_unimplemented_error(self):
         cm.match(err_msg)  #   Asserts the error msg matches the expected value
 
     def test_fake_assert(self):
-        # import time
-        # time.sleep(3)
         assert True == True
diff --git a/tests/conftest.py b/tests/conftest.py
index 1bfa81296..2e8e1230f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -106,8 +106,6 @@ def startup_teardown():
 def manage_connection():
     import arkouda as ak
 
-    import time
-    time.sleep(3)
     try:
         ak.connect(server=pytest.server, port=pytest.port, timeout=pytest.timeout)
         pytest.max_rank = get_max_array_rank()
diff --git a/tests/numpy/dtypes_test.py b/tests/numpy/dtypes_test.py
index e279cf677..4c1c0522a 100644
--- a/tests/numpy/dtypes_test.py
+++ b/tests/numpy/dtypes_test.py
@@ -25,8 +25,6 @@
 class TestDTypes:
 
     def test_resolve_scalar_dtype(self):
-        # import time
-        # time.sleep(3)
         for b in True, False:
             assert "bool" == dtypes.resolve_scalar_dtype(b)