diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/array/TestLongArray.java b/unsafe/src/test/java/org/apache/spark/unsafe/array/LongArraySuite.java
similarity index 97%
rename from unsafe/src/test/java/org/apache/spark/unsafe/array/TestLongArray.java
rename to unsafe/src/test/java/org/apache/spark/unsafe/array/LongArraySuite.java
index 53492226a43d5..5974cf91ff993 100644
--- a/unsafe/src/test/java/org/apache/spark/unsafe/array/TestLongArray.java
+++ b/unsafe/src/test/java/org/apache/spark/unsafe/array/LongArraySuite.java
@@ -22,7 +22,7 @@
 
 import org.apache.spark.unsafe.memory.MemoryBlock;
 
-public class TestLongArray {
+public class LongArraySuite {
 
   @Test
   public void basicTest() {
diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/bitset/TestBitSet.java b/unsafe/src/test/java/org/apache/spark/unsafe/bitset/BitSetSuite.java
similarity index 98%
rename from unsafe/src/test/java/org/apache/spark/unsafe/bitset/TestBitSet.java
rename to unsafe/src/test/java/org/apache/spark/unsafe/bitset/BitSetSuite.java
index fa84e404fd4d4..4bf132fd4053e 100644
--- a/unsafe/src/test/java/org/apache/spark/unsafe/bitset/TestBitSet.java
+++ b/unsafe/src/test/java/org/apache/spark/unsafe/bitset/BitSetSuite.java
@@ -23,7 +23,7 @@
 
 import org.apache.spark.unsafe.memory.MemoryBlock;
 
-public class TestBitSet {
+public class BitSetSuite {
 
   private static BitSet createBitSet(int capacity) {
     assert capacity % 64 == 0;
diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/hash/TestMurmur3_x86_32.java b/unsafe/src/test/java/org/apache/spark/unsafe/hash/Murmur3_x86_32Suite.java
similarity index 99%
rename from unsafe/src/test/java/org/apache/spark/unsafe/hash/TestMurmur3_x86_32.java
rename to unsafe/src/test/java/org/apache/spark/unsafe/hash/Murmur3_x86_32Suite.java
index 558cf4db87522..3b9175835229c 100644
--- a/unsafe/src/test/java/org/apache/spark/unsafe/hash/TestMurmur3_x86_32.java
+++ b/unsafe/src/test/java/org/apache/spark/unsafe/hash/Murmur3_x86_32Suite.java
@@ -28,7 +28,7 @@
 /**
  * Test file based on Guava's Murmur3Hash32Test.
  */
-public class TestMurmur3_x86_32 {
+public class Murmur3_x86_32Suite {
 
   private static final Murmur3_x86_32 hasher = new Murmur3_x86_32(0);
 
diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/map/AbstractTestBytesToBytesMap.java b/unsafe/src/test/java/org/apache/spark/unsafe/map/AbstractBytesToBytesMapSuite.java
similarity index 99%
rename from unsafe/src/test/java/org/apache/spark/unsafe/map/AbstractTestBytesToBytesMap.java
rename to unsafe/src/test/java/org/apache/spark/unsafe/map/AbstractBytesToBytesMapSuite.java
index 48abf605b7bdb..96fa85302e36b 100644
--- a/unsafe/src/test/java/org/apache/spark/unsafe/map/AbstractTestBytesToBytesMap.java
+++ b/unsafe/src/test/java/org/apache/spark/unsafe/map/AbstractBytesToBytesMapSuite.java
@@ -33,7 +33,7 @@
 import org.apache.spark.unsafe.memory.MemoryManager;
 import static org.apache.spark.unsafe.PlatformDependent.BYTE_ARRAY_OFFSET;
 
-public abstract class AbstractTestBytesToBytesMap {
+public abstract class AbstractBytesToBytesMapSuite {
 
   private final Random rand = new Random(42);
 
diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/map/TestBytesToBytesMapOffHeap.java b/unsafe/src/test/java/org/apache/spark/unsafe/map/BytesToBytesMapOffHeapSuite.java
similarity index 92%
rename from unsafe/src/test/java/org/apache/spark/unsafe/map/TestBytesToBytesMapOffHeap.java
rename to unsafe/src/test/java/org/apache/spark/unsafe/map/BytesToBytesMapOffHeapSuite.java
index c52a5d59ea6d6..5a10de49f54fe 100644
--- a/unsafe/src/test/java/org/apache/spark/unsafe/map/TestBytesToBytesMapOffHeap.java
+++ b/unsafe/src/test/java/org/apache/spark/unsafe/map/BytesToBytesMapOffHeapSuite.java
@@ -19,7 +19,7 @@
 
 import org.apache.spark.unsafe.memory.MemoryAllocator;
 
-public class TestBytesToBytesMapOffHeap extends AbstractTestBytesToBytesMap {
+public class BytesToBytesMapOffHeapSuite extends AbstractBytesToBytesMapSuite {
 
   @Override
   protected MemoryAllocator getMemoryAllocator() {
diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/map/TestBytesToBytesMapOnHeap.java b/unsafe/src/test/java/org/apache/spark/unsafe/map/BytesToBytesMapOnHeapSuite.java
similarity index 92%
rename from unsafe/src/test/java/org/apache/spark/unsafe/map/TestBytesToBytesMapOnHeap.java
rename to unsafe/src/test/java/org/apache/spark/unsafe/map/BytesToBytesMapOnHeapSuite.java
index 9fb412d9fae07..12cc9b25d93b3 100644
--- a/unsafe/src/test/java/org/apache/spark/unsafe/map/TestBytesToBytesMapOnHeap.java
+++ b/unsafe/src/test/java/org/apache/spark/unsafe/map/BytesToBytesMapOnHeapSuite.java
@@ -19,7 +19,7 @@
 
 import org.apache.spark.unsafe.memory.MemoryAllocator;
 
-public class TestBytesToBytesMapOnHeap extends AbstractTestBytesToBytesMap {
+public class BytesToBytesMapOnHeapSuite extends AbstractBytesToBytesMapSuite {
 
   @Override
   protected MemoryAllocator getMemoryAllocator() {