diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/TypeCachingMockBytecodeGeneratorTest.java b/src/test/java/org/mockito/internal/creation/bytebuddy/TypeCachingMockBytecodeGeneratorTest.java
index e26b36d531..026fba3bfb 100644
--- a/src/test/java/org/mockito/internal/creation/bytebuddy/TypeCachingMockBytecodeGeneratorTest.java
+++ b/src/test/java/org/mockito/internal/creation/bytebuddy/TypeCachingMockBytecodeGeneratorTest.java
@@ -145,7 +145,7 @@ public void ensure_cache_returns_different_instance_serializableMode() throws Ex
     }
 
     @Test
-    public void ensure_cache_returns_different_instance_defaultAnswer() throws Exception {
+    public void ensure_cache_returns_same_instance_defaultAnswer() throws Exception {
         // given
         ClassLoader classloader_with_life_shorter_than_cache =
                 inMemoryClassLoader()
@@ -174,10 +174,10 @@ public void ensure_cache_returns_different_instance_defaultAnswer() throws Excep
                                     SerializableMode.NONE,
                                     false,
                                     answer));
-            assertThat(classes.add(klass)).isTrue();
+            assertThat(classes.add(klass)).isFalse();
         }
 
-        assertThat(classes).hasSize(answers.length + 1);
+        assertThat(classes).hasSize(1);
     }
 
     @Test
diff --git a/src/test/java/org/mockitousage/spies/MockCreationShouldNotAffectSpyTest.java b/src/test/java/org/mockitousage/spies/MockCreationShouldNotAffectSpyTest.java
deleted file mode 100644
index c77e589594..0000000000
--- a/src/test/java/org/mockitousage/spies/MockCreationShouldNotAffectSpyTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2007 Mockito contributors
- * This program is made available under the terms of the MIT License.
- */
-package org.mockitousage.spies;
-
-import org.junit.Test;
-import org.mockitoutil.TestBase;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-
-public class MockCreationShouldNotAffectSpyTest extends TestBase {
-
-    @Test
-    public void test() {
-        TestClass instance = new TestClass(42);
-
-        TestClass mock = mock(TestClass.class);
-        assertEquals(mock.hashCode(), mock.hashCode());
-        assertEquals(mock, mock);
-
-        TestClass spy = spy(instance);
-        assertEquals(instance.hashCode(), spy.hashCode());
-        assertEquals(spy, instance);
-        assertEquals(instance, spy);
-    }
-
-    static class TestClass {
-        private final long value;
-
-        TestClass(final long value) {
-            this.value = value;
-        }
-
-        public boolean equals(final Object o) {
-            if (!(o instanceof TestClass)) {
-                return false;
-            }
-            return value == ((TestClass) o).value;
-        }
-
-        public int hashCode() {
-            return Long.hashCode(value);
-        }
-    }
-}
diff --git a/src/test/java/org/mockitousage/spies/SpyCreationShouldNotAffectMockTest.java b/src/test/java/org/mockitousage/spies/SpyCreationShouldNotAffectMockTest.java
deleted file mode 100644
index a57ec082c1..0000000000
--- a/src/test/java/org/mockitousage/spies/SpyCreationShouldNotAffectMockTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2007 Mockito contributors
- * This program is made available under the terms of the MIT License.
- */
-package org.mockitousage.spies;
-
-import org.junit.Test;
-import org.mockitoutil.TestBase;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-
-public class SpyCreationShouldNotAffectMockTest extends TestBase {
-
-    @Test
-    public void test() {
-        TestClass instance = new TestClass(Long.MIN_VALUE);
-
-        TestClass spy = spy(instance);
-        assertEquals(instance.hashCode(), spy.hashCode());
-        assertEquals(spy, instance);
-        assertEquals(instance, spy);
-
-        TestClass mock = mock(TestClass.class);
-        assertEquals(mock.hashCode(), mock.hashCode());
-        assertEquals(mock, mock);
-    }
-
-    static class TestClass {
-        private final long value;
-
-        TestClass(final long value) {
-            this.value = value;
-        }
-
-        public boolean equals(final Object o) {
-            if (!(o instanceof TestClass)) {
-                return false;
-            }
-            return value == ((TestClass) o).value;
-        }
-
-        public int hashCode() {
-            return Long.hashCode(value);
-        }
-    }
-}
diff --git a/src/test/java/org/mockitousage/spies/SpyingOnRealObjectsTest.java b/src/test/java/org/mockitousage/spies/SpyingOnRealObjectsTest.java
index 06b4878fa3..a3ed58cfd4 100644
--- a/src/test/java/org/mockitousage/spies/SpyingOnRealObjectsTest.java
+++ b/src/test/java/org/mockitousage/spies/SpyingOnRealObjectsTest.java
@@ -9,7 +9,6 @@
 import static org.junit.Assume.assumeTrue;
 import static org.mockito.Mockito.*;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -193,13 +192,4 @@ public void shouldSayNiceMessageWhenSpyingOnPrivateClass() throws Exception {
                             "Most likely it is due to mocking a private class that is not visible to Mockito");
         }
     }
-
-    @Test
-    public void spysHashCodeEqualsDelegatedToActualMethods() {
-        List<String> real = new ArrayList<>();
-        real.add("one");
-        List<String> spy = spy(real);
-        assertEquals(real.hashCode(), spy.hashCode());
-        assertTrue(spy.equals(real));
-    }
 }