diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/agent/builder/AgentBuilderInitializationStrategyTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/agent/builder/AgentBuilderInitializationStrategyTest.java
index 893d2dc95d6..3fc9bf1d785 100644
--- a/byte-buddy-dep/src/test/java/net/bytebuddy/agent/builder/AgentBuilderInitializationStrategyTest.java
+++ b/byte-buddy-dep/src/test/java/net/bytebuddy/agent/builder/AgentBuilderInitializationStrategyTest.java
@@ -14,9 +14,7 @@
 
 import java.lang.annotation.Annotation;
 import java.security.ProtectionDomain;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -75,25 +73,26 @@ public void testPrematureApplication() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public void testMinimalRegistrationIndependentType() throws Exception {
         Annotation eagerAnnotation = mock(AuxiliaryType.SignatureRelevant.class);
         when(eagerAnnotation.annotationType()).thenReturn((Class) AuxiliaryType.SignatureRelevant.class);
         TypeDescription independent = mock(TypeDescription.class), dependent = mock(TypeDescription.class);
         when(independent.getDeclaredAnnotations()).thenReturn(new AnnotationList.ForLoadedAnnotations(eagerAnnotation));
         when(dependent.getDeclaredAnnotations()).thenReturn(new AnnotationList.Empty());
-        Map<TypeDescription, byte[]> map = new HashMap<TypeDescription, byte[]>();
-        map.put(independent, QUX);
-        map.put(dependent, BAZ);
-        when(dynamicType.getAuxiliaryTypes()).thenReturn(map);
+        when(dynamicType.getAuxiliaryTypeDescriptions()).thenReturn(new HashSet<TypeDescription>(Arrays.asList(independent, dependent)));
+        Map<TypeDescription, byte[]> auxiliaryTypes = new HashMap<TypeDescription, byte[]>();
+        auxiliaryTypes.put(independent, QUX);
+        auxiliaryTypes.put(dependent, BAZ);
+        when(dynamicType.getAuxiliaryTypes()).thenReturn(auxiliaryTypes);
         ClassInjector classInjector = mock(ClassInjector.class);
         when(injectionStrategy.resolve(classLoader, protectionDomain)).thenReturn(classInjector);
-        when(classInjector.inject(Collections.singletonMap(independent, QUX)))
+        when(classInjector.inject(Collections.singleton(independent), dynamicType))
                 .thenReturn(Collections.<TypeDescription, Class<?>>singletonMap(independent, Foo.class));
         LoadedTypeInitializer loadedTypeInitializer = mock(LoadedTypeInitializer.class);
         when(dynamicType.getLoadedTypeInitializers()).thenReturn(Collections.singletonMap(independent, loadedTypeInitializer));
         AgentBuilder.InitializationStrategy.Minimal.INSTANCE.register(dynamicType, classLoader, protectionDomain, injectionStrategy);
-        verify(classInjector).inject(Collections.singletonMap(independent, QUX));
+        verify(classInjector).inject(Collections.singleton(independent), dynamicType);
         verifyNoMoreInteractions(classInjector);
         verify(loadedTypeInitializer).onLoad(Foo.class);
         verifyNoMoreInteractions(loadedTypeInitializer);