diff --git a/context-propagation-core/src/test/java/nl/talsmasoftware/context/core/delegation/DelegatingFutureTest.java b/context-propagation-core/src/test/java/nl/talsmasoftware/context/core/delegation/DelegatingFutureTest.java
index 95e9b469..63671670 100644
--- a/context-propagation-core/src/test/java/nl/talsmasoftware/context/core/delegation/DelegatingFutureTest.java
+++ b/context-propagation-core/src/test/java/nl/talsmasoftware/context/core/delegation/DelegatingFutureTest.java
@@ -49,7 +49,7 @@
  */
 public class DelegatingFutureTest {
 
-    private static class TestDelegatingFuture extends nl.talsmasoftware.context.core.delegation.DelegatingFuture<Object> {
+    private static class TestDelegatingFuture extends DelegatingFuture<Object> {
         private TestDelegatingFuture(Future<Object> delegate) {
             super(delegate);
         }
diff --git a/timers/context-timer-metrics/src/test/java/nl/talsmasoftware/context/timers/metrics/MetricsContextTimerTest.java b/timers/context-timer-metrics/src/test/java/nl/talsmasoftware/context/timers/metrics/MetricsContextTimerTest.java
index e322cd8a..0b4a2e54 100644
--- a/timers/context-timer-metrics/src/test/java/nl/talsmasoftware/context/timers/metrics/MetricsContextTimerTest.java
+++ b/timers/context-timer-metrics/src/test/java/nl/talsmasoftware/context/timers/metrics/MetricsContextTimerTest.java
@@ -68,7 +68,7 @@ public void resetCacheAndRegistry() {
     public void testCreateSnapshotInFreshApplication() {
         assertThat(SharedMetricRegistries.names(), is(empty()));
         ContextSnapshot snapshot = ContextManagers.createContextSnapshot();
-        String name = MetricRegistry.name(nl.talsmasoftware.context.core.ContextManagers.class, "createContextSnapshot");
+        String name = MetricRegistry.name(ContextManagers.class, "createContextSnapshot");
         assertThat(snapshot, is(notNullValue()));
 
         assertThat(SharedMetricRegistries.names(), contains("ContextPropagationMetrics"));
@@ -83,7 +83,7 @@ public void testCreateSnapshotInApplicationWithDefaultRegistry() {
 
         assertThat(SharedMetricRegistries.names(), contains("DefaultRegistry"));
         ContextSnapshot snapshot = ContextManagers.createContextSnapshot();
-        String name = MetricRegistry.name(nl.talsmasoftware.context.core.ContextManagers.class, "createContextSnapshot");
+        String name = MetricRegistry.name(ContextManagers.class, "createContextSnapshot");
         assertThat(snapshot, is(notNullValue()));
 
         assertThat(SharedMetricRegistries.names(), contains("DefaultRegistry")); // No new registries!
@@ -99,7 +99,7 @@ public void testCreateSnapshotInApplicationWithSingleNonDefaultRegistry() {
 
         assertThat(SharedMetricRegistries.names(), contains("NonDefaultRegistry"));
         ContextSnapshot snapshot = ContextManagers.createContextSnapshot();
-        String name = MetricRegistry.name(nl.talsmasoftware.context.core.ContextManagers.class, "createContextSnapshot");
+        String name = MetricRegistry.name(ContextManagers.class, "createContextSnapshot");
         assertThat(snapshot, is(notNullValue()));
 
         assertThat(SharedMetricRegistries.names(), contains("NonDefaultRegistry")); // No new registries!
@@ -117,7 +117,7 @@ public void testCreate3SnapshotsInApplicationWithMultipleNonDefaultRegistries()
         for (int i = 1; i <= 3; i++) {
             assertThat(ContextManagers.createContextSnapshot(), is(notNullValue()));
         }
-        String name = MetricRegistry.name(nl.talsmasoftware.context.core.ContextManagers.class, "createContextSnapshot");
+        String name = MetricRegistry.name(ContextManagers.class, "createContextSnapshot");
 
         assertThat(registry1.getTimers().containsKey(name), is(true));
         assertThat(registry1.timer(name).getCount(), is(3L));
diff --git a/timers/context-timer-micrometer/src/test/java/nl/talsmasoftware/context/timers/micrometer/MicrometerContextTimerTest.java b/timers/context-timer-micrometer/src/test/java/nl/talsmasoftware/context/timers/micrometer/MicrometerContextTimerTest.java
index 50aa5cba..1d11f032 100644
--- a/timers/context-timer-micrometer/src/test/java/nl/talsmasoftware/context/timers/micrometer/MicrometerContextTimerTest.java
+++ b/timers/context-timer-micrometer/src/test/java/nl/talsmasoftware/context/timers/micrometer/MicrometerContextTimerTest.java
@@ -49,7 +49,7 @@ public void shutdownRegistry() {
 
     @Test
     public void testCreateSnapshotInFreshApplication() {
-        Timer timer = Metrics.timer(nl.talsmasoftware.context.core.ContextManagers.class.getName() + ".createContextSnapshot");
+        Timer timer = Metrics.timer(ContextManagers.class.getName() + ".createContextSnapshot");
         assertThat(timer.count(), is(0L));
 
         ContextSnapshot snapshot = ContextManagers.createContextSnapshot();