diff --git a/test/AtomicIntegerConcurrentTest.java b/test/AtomicIntegerTest.java
similarity index 98%
rename from test/AtomicIntegerConcurrentTest.java
rename to test/AtomicIntegerTest.java
index 3056bf942a..72da50d446 100644
--- a/test/AtomicIntegerConcurrentTest.java
+++ b/test/AtomicIntegerTest.java
@@ -1,6 +1,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class AtomicIntegerConcurrentTest {
+public class AtomicIntegerTest {
   private static void runTest(final boolean increment, 
                               final int threadCount, 
                               final int iterationsPerThread) {
diff --git a/test/AtomicLongConcurrentTest.java b/test/AtomicLongTest.java
similarity index 98%
rename from test/AtomicLongConcurrentTest.java
rename to test/AtomicLongTest.java
index f76e15ce82..cb441f4295 100644
--- a/test/AtomicLongConcurrentTest.java
+++ b/test/AtomicLongTest.java
@@ -1,6 +1,6 @@
 import java.util.concurrent.atomic.AtomicLong;
 
-public class AtomicLongConcurrentTest {
+public class AtomicLongTest {
   private static void runTest(final boolean increment, 
                               final int threadCount, 
                               final int iterationsPerThread) {
diff --git a/test/AtomicReferenceConcurrentTest.java b/test/AtomicReferenceTest.java
similarity index 97%
rename from test/AtomicReferenceConcurrentTest.java
rename to test/AtomicReferenceTest.java
index 1c0b15058f..8ed2b561fd 100644
--- a/test/AtomicReferenceConcurrentTest.java
+++ b/test/AtomicReferenceTest.java
@@ -1,7 +1,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class AtomicReferenceConcurrentTest {
+public class AtomicReferenceTest {
   private static void runTest(final int threadCount, 
                               final int iterationsPerThread) {
     // we assume a 1ms delay per thread to try to get them all to start at the same time