diff --git a/hazelcast/src/test/java/com/hazelcast/test/starter/HazelcastProxyFactory.java b/hazelcast/src/test/java/com/hazelcast/test/starter/HazelcastProxyFactory.java
index 88d06fcf44c1..e2ab65ea6870 100644
--- a/hazelcast/src/test/java/com/hazelcast/test/starter/HazelcastProxyFactory.java
+++ b/hazelcast/src/test/java/com/hazelcast/test/starter/HazelcastProxyFactory.java
@@ -404,7 +404,7 @@ public static class AllAsPublicConstructorStrategy implements ConstructorStrateg
         public static final AllAsPublicConstructorStrategy INSTANCE = new AllAsPublicConstructorStrategy();
 
         @Override
-        public MethodRegistry inject(MethodRegistry methodRegistry) {
+        public MethodRegistry inject(TypeDescription instrumentedType, MethodRegistry methodRegistry) {
             return methodRegistry.append(new LatentMatcher.Resolved<MethodDescription>(isConstructor()),
                     new MethodRegistry.Handler.ForImplementation(SuperMethodCall.INSTANCE),
                     MethodAttributeAppender.NoOp.INSTANCE,
diff --git a/hazelcast/src/test/java/com/hazelcast/util/ServiceLoaderTest.java b/hazelcast/src/test/java/com/hazelcast/util/ServiceLoaderTest.java
index 87a2054b970f..32e901fd94b8 100644
--- a/hazelcast/src/test/java/com/hazelcast/util/ServiceLoaderTest.java
+++ b/hazelcast/src/test/java/com/hazelcast/util/ServiceLoaderTest.java
@@ -96,10 +96,10 @@ public void testMultipleClassloaderLoadsTheSameClass() throws Exception {
 
     @Test
     public void testHookDeduplication() {
-        ClassLoader parentClassloader = PortableHook.class.getClassLoader();
-
         Class<?> hook = newClassImplementingInterface("com.hazelcast.internal.serialization.SomeHook",
-                PortableHook.class, parentClassloader);
+                PortableHook.class, PortableHook.class.getClassLoader());
+
+        ClassLoader parentClassloader = hook.getClassLoader();
 
         //child classloader delegating everything to its parent
         URLClassLoader childClassloader = new URLClassLoader(new URL[]{}, parentClassloader);
diff --git a/pom.xml b/pom.xml
index e9fdfaa0d4f0..9966e2e79786 100755
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
         <mockito.version>1.10.19</mockito.version>
         <powermock.version>1.6.6</powermock.version>
         <jmh.version>1.16</jmh.version>
-        <bytebuddy.version>1.6.12</bytebuddy.version>
+        <bytebuddy.version>1.8.17</bytebuddy.version>
         <commons-lang3.version>3.4</commons-lang3.version>
         <felix.utils.version>1.10.0</felix.utils.version>
         <findbugs.annotations.version>3.0.0</findbugs.annotations.version>