diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2e05729d..8584d1b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,14 +38,7 @@ jobs:
           name: "Run all tests, including live API"
           command: |
             . .venv/bin/activate
-            pytest -v
-
-      - run:
-          name: "Run doctests"
-          command: |
-            . .venv/bin/activate
-            export LOG_LEVEL='ERROR'
-            python -m doctest -o ELLIPSIS -o FAIL_FAST vortexasdk/*.py
+            pytest -v --doctest-modules
 
       - run:
           name: "Build docs"
diff --git a/pytest.ini b/pytest.ini
index 1d508870..2fc54965 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,6 @@
 [pytest]
 filterwarnings =
     error
-    ignore::DeprecationWarning:
\ No newline at end of file
+    ignore::DeprecationWarning:
+
+doctest_optionflags= ELLIPSIS
\ No newline at end of file