diff --git a/.github/workflows/pypi-wheels.yml b/.github/workflows/pypi-wheels.yml
index 46bbc03..0f13bf7 100644
--- a/.github/workflows/pypi-wheels.yml
+++ b/.github/workflows/pypi-wheels.yml
@@ -117,4 +117,4 @@ jobs:
       - name: Upload to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          packages-dir: artifacts/  # This tells the action to look in your dist folder
\ No newline at end of file
+          packages-dir: artifacts/  # This tells the action to look in your dist folder
diff --git a/eigency/eigen b/eigency/eigen
index 3147391..bc3b398 160000
--- a/eigency/eigen
+++ b/eigency/eigen
@@ -1 +1 @@
-Subproject commit 3147391d946bb4b6c68edd901f2add6ac1f31f8c
+Subproject commit bc3b39870ecb690a623a3f49149a358b95c5781d
diff --git a/tests/setup.py b/tests/setup.py
index bf7fac8..2d85939 100644
--- a/tests/setup.py
+++ b/tests/setup.py
@@ -1,3 +1,6 @@
+import os
+from os.path import basename, join
+
 import numpy as np
 from Cython.Build import cythonize
 from setuptools import setup
@@ -5,11 +8,22 @@
 
 import eigency
 
+include_dirs = [np.get_include()]
+if "EIGEN_INC" in os.environ:
+    useSystemEigen = True
+    include_dirs.append(os.environ["EIGEN_INC"])
+else:
+    useSystemEigen = False
+
+    __eigen_dir__ = eigency.get_eigency_eigen_dir()
+    __eigen_lib_dir__ = join(basename(__eigen_dir__), "Eigen")
+    include_dirs.append(__eigen_dir__)
+
 extensions = [
     Extension(
         "eigency_tests.eigency_tests",
         sources=["eigency_tests/eigency_tests.pyx"],
-        include_dirs=[".", "eigency_tests"] + eigency.get_includes(),
+        include_dirs=[".", "eigency_tests"] + include_dirs,
         define_macros=[("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
     ),
 ]
@@ -19,7 +33,7 @@
         Extension(
             "eigency_tests.eigency_np2",
             sources=["eigency_tests/eigency_np2.pyx"],
-            include_dirs=[".", "eigency_tests"] + eigency.get_includes(),
+            include_dirs=[".", "eigency_tests"] + include_dirs,
             define_macros=[("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
         )
     )