diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
index a947cae..cd9af53 100644
--- a/src/Resources/config/services.yaml
+++ b/src/Resources/config/services.yaml
@@ -3,6 +3,9 @@ services:
   # Interface autowiring
   DigitalCraftsman\DateTimePrecision\Clock\Clock: '@DigitalCraftsman\DateTimePrecision\Clock\SystemClock'
 
+  DigitalCraftsman\DateTimePrecision\Clock\SystemClock:
+    class: DigitalCraftsman\DateTimePrecision\Clock\SystemClock
+
   # Normalizers
   DigitalCraftsman\DateTimePrecision\Serializer\MomentNormalizer:
     tags: [ { name: 'serializer.normalizer' } ]
@@ -18,3 +21,12 @@ services:
 
   DigitalCraftsman\DateTimePrecision\Serializer\YearNormalizer:
     tags: [ { name: 'serializer.normalizer' } ]
+
+when@test:
+  services:
+
+    # Interface autowiring
+    DigitalCraftsman\DateTimePrecision\Clock\Clock: '@DigitalCraftsman\DateTimePrecision\Clock\FrozenClock'
+
+    DigitalCraftsman\DateTimePrecision\Clock\FrozenClock:
+      class: DigitalCraftsman\DateTimePrecision\Clock\FrozenClock
diff --git a/src/Resources/config/services_test.yaml b/src/Resources/config/services_test.yaml
deleted file mode 100644
index a563b98..0000000
--- a/src/Resources/config/services_test.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
-
-  # Interface autowiring
-  DigitalCraftsman\DateTimePrecision\Clock\Clock: '@DigitalCraftsman\DateTimePrecision\Clock\FrozenClock'