diff --git a/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java b/slf4j-api/src/test/java/org/slf4j/basicTests/BasicMarkerTest.java
similarity index 100%
rename from slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java
rename to slf4j-api/src/test/java/org/slf4j/basicTests/BasicMarkerTest.java
diff --git a/slf4j-api/src/test/java/org/slf4j/Differentiator.java b/slf4j-api/src/test/java/org/slf4j/basicTests/Differentiator.java
similarity index 100%
rename from slf4j-api/src/test/java/org/slf4j/Differentiator.java
rename to slf4j-api/src/test/java/org/slf4j/basicTests/Differentiator.java
diff --git a/slf4j-api/src/test/java/org/slf4j/DoubleCheckedInt.java b/slf4j-api/src/test/java/org/slf4j/basicTests/DoubleCheckedInt.java
similarity index 100%
rename from slf4j-api/src/test/java/org/slf4j/DoubleCheckedInt.java
rename to slf4j-api/src/test/java/org/slf4j/basicTests/DoubleCheckedInt.java
diff --git a/slf4j-api/src/test/java/org/slf4j/NoBindingMultithreadedInitializationTest.java b/slf4j-api/src/test/java/org/slf4j/basicTests/NoBindingMultithreadedInitializationTest.java
similarity index 100%
rename from slf4j-api/src/test/java/org/slf4j/NoBindingMultithreadedInitializationTest.java
rename to slf4j-api/src/test/java/org/slf4j/basicTests/NoBindingMultithreadedInitializationTest.java
diff --git a/slf4j-api/src/test/java/org/slf4j/NoBindingTest.java b/slf4j-api/src/test/java/org/slf4j/basicTests/NoBindingTest.java
similarity index 100%
rename from slf4j-api/src/test/java/org/slf4j/NoBindingTest.java
rename to slf4j-api/src/test/java/org/slf4j/basicTests/NoBindingTest.java
diff --git a/slf4j-api/src/test/java/org/slf4j/event/EventRecodingLoggerTest.java b/slf4j-api/src/test/java/org/slf4j/eventTest/EventRecodingLoggerTest.java
similarity index 100%
rename from slf4j-api/src/test/java/org/slf4j/event/EventRecodingLoggerTest.java
rename to slf4j-api/src/test/java/org/slf4j/eventTest/EventRecodingLoggerTest.java
diff --git a/slf4j-nop/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/slf4j-nop/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
index b8bc39515..9929e9df0 100755
--- a/slf4j-nop/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
+++ b/slf4j-nop/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
@@ -1 +1 @@
-org.slf4j.helpers.NOPServiceProvider
\ No newline at end of file
+org.slf4j.nop.NOPServiceProvider
\ No newline at end of file