diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/EntryPoint.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/EntryPoint.java
index c622b4ea709..88c90d31cb4 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/build/EntryPoint.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/build/EntryPoint.java
@@ -33,7 +33,7 @@
 /**
  * An entry point for a build tool which is responsible for the transformation's configuration.
  */
-public interface EntryPoint {
+public interface EntryPoint extends Serializable {
 
     /**
      * Returns the Byte Buddy instance to use.
@@ -159,7 +159,7 @@ public DynamicType.Builder<?> transform(TypeDescription typeDescription,
      * An entry point that wraps another entry point but disables validation.
      */
     @HashCodeAndEqualsPlugin.Enhance
-    class Unvalidated implements EntryPoint, Serializable {
+    class Unvalidated implements EntryPoint {
 
         /**
          * The serial version UID.
diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/asm/MemberSubstitutionTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/asm/MemberSubstitutionTest.java
index e639e48d167..74806db9570 100644
--- a/byte-buddy-dep/src/test/java/net/bytebuddy/asm/MemberSubstitutionTest.java
+++ b/byte-buddy-dep/src/test/java/net/bytebuddy/asm/MemberSubstitutionTest.java
@@ -1,6 +1,5 @@
 package net.bytebuddy.asm;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.modifier.Visibility;
@@ -876,7 +875,7 @@ public void testSubstitutionChainArgumentInstrumentedMethodLoadedThis() throws E
         Object instance = type.getDeclaredConstructor().newInstance();
         assertThat(type.getDeclaredField(FOO).get(instance), is((Object) FOO));
         assertThat(type.getDeclaredMethod(RUN, Object.class).invoke(instance, QUX), nullValue(Object.class));
-        assertThat(type.getDeclaredField(FOO).get(instance), is((Object) instance));
+        assertThat(type.getDeclaredField(FOO).get(instance), is(instance));
     }
 
     @Test
diff --git a/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/build/maven/InitializationTest.java b/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/build/maven/InitializationTest.java
index a1364728d85..c97a8ceacb5 100644
--- a/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/build/maven/InitializationTest.java
+++ b/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/build/maven/InitializationTest.java
@@ -132,6 +132,8 @@ public void testAsCoordinateUnresolved() throws Exception {
 
     public static class Foo implements EntryPoint {
 
+        private static final long serialVersionUID = 1L;
+
         public ByteBuddy byteBuddy(ClassFileVersion classFileVersion) {
             throw new AssertionError();
         }
diff --git a/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/IllegalEntryPoint.java b/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/IllegalEntryPoint.java
index 8dd1a1bbcb5..1c54d6e35b7 100644
--- a/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/IllegalEntryPoint.java
+++ b/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/IllegalEntryPoint.java
@@ -10,6 +10,8 @@
 
 public class IllegalEntryPoint implements EntryPoint {
 
+    private static final long serialVersionUID = 1L;
+
     public ByteBuddy byteBuddy(ClassFileVersion classFileVersion) {
         throw new RuntimeException();
     }
diff --git a/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/IllegalTransformEntryPoint.java b/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/IllegalTransformEntryPoint.java
index 77113590f89..7ab488e8bd2 100644
--- a/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/IllegalTransformEntryPoint.java
+++ b/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/IllegalTransformEntryPoint.java
@@ -10,6 +10,8 @@
 
 public class IllegalTransformEntryPoint implements EntryPoint {
 
+    private static final long serialVersionUID = 1L;
+
     public ByteBuddy byteBuddy(ClassFileVersion classFileVersion) {
         return new ByteBuddy(classFileVersion);
     }
diff --git a/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/SimpleEntryPoint.java b/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/SimpleEntryPoint.java
index 916fa181b0d..98770cb35bb 100644
--- a/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/SimpleEntryPoint.java
+++ b/byte-buddy-maven-plugin/src/test/java/net/bytebuddy/test/SimpleEntryPoint.java
@@ -10,6 +10,8 @@
 
 public class SimpleEntryPoint implements EntryPoint {
 
+    private static final long serialVersionUID = 1L;
+
     public ByteBuddy byteBuddy(ClassFileVersion classFileVersion) {
         return new ByteBuddy(classFileVersion);
     }