diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 9c788ff5..25ddbde2 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -47,10 +47,11 @@ jobs:
           flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
       - name: Test with pytest
         run: |
-          pytest riptable/tests
+          python -m riptable.tests.run
       - name: Tooling integration tests
         run: |
-          ipython -m pytest riptable/test_tooling_integration
+          echo "DISABLED until tooling tests can be updated"
+          #ipython -m riptable.test_tooling_integration.run
       # disable hypothesis tests until they run faster, are more consistent, and are easier to investigate
       #- name: Property based hypothesis tests
       #  run: |
diff --git a/riptable/test_tooling_integration/ipykernel_integration_test.py b/riptable/test_tooling_integration/ipykernel_integration_test.py
index eb01ee43..20a7c727 100644
--- a/riptable/test_tooling_integration/ipykernel_integration_test.py
+++ b/riptable/test_tooling_integration/ipykernel_integration_test.py
@@ -86,7 +86,7 @@ def get_matches(code_text: str, complete_text: str) -> List[str]:
         assert reply['status'] == 'ok'
         wait_for_idle(kc)
         kc.complete(complete_text)
-        reply = kc.get_shell_msg(block=True, timeout=TIMEOUT)
+        reply = kc.get_shell_msg(timeout=TIMEOUT)
         matches = reply['content']['matches']
     return matches
 
diff --git a/riptable/test_tooling_integration/run.py b/riptable/test_tooling_integration/run.py
new file mode 100644
index 00000000..e943c49e
--- /dev/null
+++ b/riptable/test_tooling_integration/run.py
@@ -0,0 +1,26 @@
+# $Id$
+
+import pytest
+import sys
+import os
+
+
+def run_all(extra_args=None):
+    """
+    Run all the tooling integration tests of riptable.
+
+    Parameters
+    ----------
+    extra_args : list
+        List of extra arguments (e.g. ['--verbosity=3'])
+    """
+    if extra_args is None:
+        extra_args = []
+    return pytest.main(extra_args + ['-k', 'test_', os.path.dirname(__file__)])
+
+
+# Usage: "ipython -m riptable.test_tooling_integration.run"
+# You can add more arguments to the pytest, like "ipython -m riptable.test_tooling_integration.run --verbosity=2"
+if __name__ == "__main__":
+    # Force ipython to exit with the exit code, as sys.exit() is caught and ignored :-/
+    os._exit(run_all(sys.argv[1:]))
diff --git a/riptable/tests/run.py b/riptable/tests/run.py
index 5c6206c5..93059be8 100644
--- a/riptable/tests/run.py
+++ b/riptable/tests/run.py
@@ -16,10 +16,10 @@ def run_all(extra_args=None):
     """
     if extra_args is None:
         extra_args = []
-    pytest.main(extra_args + ['-k', 'test_', os.path.dirname(__file__)])
+    return pytest.main(extra_args + ['-k', 'test_', os.path.dirname(__file__)])
 
 
 # Usage: "python -m riptable.tests.run"
 # You can add more arguments to the pytest, like "python -m riptable.tests.run --verbosity=2"
 if __name__ == "__main__":
-    run_all(sys.argv[1:])
+    sys.exit(run_all(sys.argv[1:]))