diff --git a/pyproject.toml b/pyproject.toml
index 43525cba2..582a904c7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,9 +24,9 @@ documentation = "https://docs.fenicsproject.org"
 [project.optional-dependencies]
 docs = ["markdown", "pylit3", "pyyaml", "sphinx", "pydata-sphinx-theme"]
 lint = ["ruff", "gersemi"]
-optional = ["numba", "fenics-ufl@git+https://github.com/fenics/ufl"]
+# llvmlite (numba) is not built for x86_64 on macOS or arm64 on Windows - advanced users can install manually.
+optional = ["numba; (sys_platform != 'darwin' or platform_machine != 'x86_64') and (sys_platform != 'win32' or platform_machine != 'ARM64')", "fenics-ufl@git+https://github.com/fenics/ufl"]
 test = ["pytest", "sympy", "scipy", "matplotlib", "fenics-basix[optional]"]
-test-no-numba = ["pytest", "sympy", "scipy", "matplotlib", "fenics-ufl@git+https://github.com/fenics/ufl"]
 ci = ["mypy", "pytest-xdist", "fenics-basix[docs,lint,test,optional]"]
 
 [tool.pytest.ini_options]
@@ -80,11 +80,6 @@ archs = [
     "native",
 ]
 
-# llvmlite (numba) is not built for x86_64 on macOS or arm64 on Windows.
-[[tool.cibuildwheel.overrides]]
-select = ["*-macosx_x86_64", "*-win_arm64"]
-test-extras = ["test-no-numba"]
-
 [tool.mypy]
 ignore_missing_imports = true
 
diff --git a/python/pyproject.toml b/python/pyproject.toml
index aa26f7786..16a38421e 100644
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -24,9 +24,9 @@ documentation = "https://docs.fenicsproject.org"
 [project.optional-dependencies]
 docs = ["markdown", "pylit3", "pyyaml", "sphinx", "pydata-sphinx-theme"]
 lint = ["ruff", "gersemi"]
-optional = ["numba", "fenics-ufl@git+https://github.com/fenics/ufl"]
+# llvmlite (numba) is not built for x86_64 on macOS or arm64 on Windows.
+optional = ["numba; (sys_platform != 'darwin' or platform_machine != 'x86_64') and (sys_platform != 'win32' or platform_machine != 'ARM64')", "fenics-ufl@git+https://github.com/fenics/ufl"]
 test = ["pytest", "sympy", "scipy", "matplotlib", "fenics-basix[optional]"]
-test-no-numba = ["pytest", "sympy", "scipy", "matplotlib", "fenics-ufl@git+https://github.com/fenics/ufl"]
 ci = ["mypy", "pytest-xdist", "fenics-basix[docs,lint,test,optional]"]
 
 [tool.mypy]