9 files changed, 50 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8fefd401..04b36130e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -188,12 +188,6 @@ jobs:
        export PYTHONPATH="$PYTHONPATH:$(dirname $(find build/install/ -name "pycvc4" -type d))"
        python3 -c "import pycvc4"
 
-    - name: Run Pytest
-      if: matrix.python-bindings
-      run: |
-       export PYTHONPATH="$PYTHONPATH:$(dirname $(find build/install/ -name "pycvc4" -type d))"
-       python3 -m pytest ./test/unit/api/python
-
       # Examples are built for non-symfpu builds
     - name: Check Examples
       if: matrix.check-examples && runner.os == 'Linux'
diff --git a/test/api/CMakeLists.txt b/test/api/CMakeLists.txt
index 34a18d9b2..59df71010 100644
--- a/test/api/CMakeLists.txt
+++ b/test/api/CMakeLists.txt
@@ -67,3 +67,9 @@ if (USE_EDITLINE)
     )
   endif()
 endif()
+
+
+# add Python bindings tests if building with Python bindings
+if (BUILD_BINDINGS_PYTHON)
+  add_subdirectory(python)
+endif()
diff --git a/test/api/python/CMakeLists.txt b/test/api/python/CMakeLists.txt
new file mode 100644
index 000000000..300038ada
--- /dev/null
+++ b/test/api/python/CMakeLists.txt
@@ -0,0 +1,43 @@
+#####################
+## CMakeLists.txt
+## Top contributors (to current version):
+##   Makai Mann
+## This file is part of the CVC4 project.
+## Copyright (c) 2009-2020 by the authors listed in the file AUTHORS
+## in the top-level source directory and their institutional affiliations.
+## All rights reserved.  See the file COPYING in the top-level source
+## directory for licensing information.
+##
+#-----------------------------------------------------------------------------#
+# Add Python bindings API tests
+
+# Check if the pytest Python module is installed.
+execute_process(
+  COMMAND
+  ${PYTHON_EXECUTABLE} -c "import pytest"
+  RESULT_VARIABLE
+    RET_PYTEST
+  ERROR_QUIET
+)
+
+if(RET_PYTEST)
+    message(FATAL_ERROR
+      "Could not find Python module pytest. Install via `pip install pytest'.")
+endif()
+
+macro(cvc4_add_python_api_test name filename)
+
+  #   we create test target 'api/<output_dir>/myapitest'
+  #   and run it with 'ctest -R "api/<output_dir>/myapitest"'.
+  add_test (NAME api/api/python/${name}
+    COMMAND ${PYTHON_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/${filename}
+    # directory for importing the python bindings
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/api/python)
+
+endmacro()
+
+cvc4_add_python_api_test(pytest_datatype_api test_datatype_api.py)
+cvc4_add_python_api_test(pytest_grammar test_grammar.py)
+cvc4_add_python_api_test(pytest_sort test_sort.py)
+cvc4_add_python_api_test(pytest_term test_term.py)
+cvc4_add_python_api_test(pytest_to_python_obj test_to_python_obj.py)
diff --git a/test/unit/api/python/test_datatype_api.py b/test/api/python/test_datatype_api.py
index c692416c6..c692416c6 100644
--- a/test/unit/api/python/test_datatype_api.py
+++ b/test/api/python/test_datatype_api.py
diff --git a/test/unit/api/python/test_grammar.py b/test/api/python/test_grammar.py
index 5a0d5101f..5a0d5101f 100644
--- a/test/unit/api/python/test_grammar.py
+++ b/test/api/python/test_grammar.py
diff --git a/test/unit/api/python/test_sort.py b/test/api/python/test_sort.py
index cff92ca8d..cff92ca8d 100644
--- a/test/unit/api/python/test_sort.py
+++ b/test/api/python/test_sort.py
diff --git a/test/unit/api/python/test_term.py b/test/api/python/test_term.py
index a0c1b4681..a0c1b4681 100644
--- a/test/unit/api/python/test_term.py
+++ b/test/api/python/test_term.py
diff --git a/test/unit/api/python/test_to_python_obj.py b/test/api/python/test_to_python_obj.py
index eb15e7469..eb15e7469 100644
--- a/test/unit/api/python/test_to_python_obj.py
+++ b/test/api/python/test_to_python_obj.py
diff --git a/test/unit/api/CMakeLists.txt b/test/unit/api/CMakeLists.txt
index 61dc6e15f..1412c7f66 100644
--- a/test/unit/api/CMakeLists.txt
+++ b/test/unit/api/CMakeLists.txt
@@ -18,3 +18,4 @@ cvc4_add_unit_test_black(solver_black api)
 cvc4_add_unit_test_black(sort_black api)
 cvc4_add_unit_test_black(term_black api)
 cvc4_add_unit_test_black(grammar_black api)
+