diff --git a/baybe/surrogates/gaussian_process/core.py b/baybe/surrogates/gaussian_process/core.py
index 6db92cdb9..bcb7eb361 100644
--- a/baybe/surrogates/gaussian_process/core.py
+++ b/baybe/surrogates/gaussian_process/core.py
@@ -38,9 +38,14 @@ class GaussianProcessSurrogate(Surrogate):
 
     # Object variables
     kernel_factory: KernelFactory = field(
-        factory=DefaultKernelFactory, converter=to_kernel_factory
+        alias="kernel_or_factory",
+        factory=DefaultKernelFactory,
+        converter=to_kernel_factory,
     )
     """The factory used to create the kernel of the Gaussian process.
+
+    Accepts either a :class:`baybe.kernels.base.Kernel` or a
+    :class:`.kernel_factory.KernelFactory`.
     When passing a :class:`baybe.kernels.base.Kernel`, it gets automatically wrapped
     into a :class:`.kernel_factory.PlainKernelFactory`."""
 
diff --git a/tests/conftest.py b/tests/conftest.py
index abecb3fb0..5bee25f32 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -619,7 +619,7 @@ def fixture_default_surrogate_model(request, onnx_surrogate, kernel):
     """The default surrogate model to be used if not specified differently."""
     if hasattr(request, "param") and request.param == "onnx":
         return onnx_surrogate
-    return GaussianProcessSurrogate(kernel_factory=kernel)
+    return GaussianProcessSurrogate(kernel_or_factory=kernel)
 
 
 @pytest.fixture(name="initial_recommender")