diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/package-info.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/package-info.java
deleted file mode 100644
index 1b9e3c1ea7..0000000000
--- a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Reusable classes that help testing the code that uses SCTP transport.
- */
-package io.netty.testsuite.transport.sctp;
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/package-info.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/package-info.java
deleted file mode 100644
index 6f2f8cfd48..0000000000
--- a/testsuite/src/main/java/io/netty/testsuite/transport/socket/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Reusable classes that help testing the code that uses socket and datagram transport.
- */
-package io.netty.testsuite.transport.socket;
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java b/testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/util/BogusKeyStore.java b/testsuite/src/test/java/io/netty/testsuite/util/BogusKeyStore.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/util/BogusKeyStore.java
rename to testsuite/src/test/java/io/netty/testsuite/util/BogusKeyStore.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/util/BogusSslContextFactory.java b/testsuite/src/test/java/io/netty/testsuite/util/BogusSslContextFactory.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/util/BogusSslContextFactory.java
rename to testsuite/src/test/java/io/netty/testsuite/util/BogusSslContextFactory.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/util/BogusTrustManagerFactory.java b/testsuite/src/test/java/io/netty/testsuite/util/BogusTrustManagerFactory.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/util/BogusTrustManagerFactory.java
rename to testsuite/src/test/java/io/netty/testsuite/util/BogusTrustManagerFactory.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/util/TestUtils.java b/testsuite/src/test/java/io/netty/testsuite/util/TestUtils.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/util/TestUtils.java
rename to testsuite/src/test/java/io/netty/testsuite/util/TestUtils.java
diff --git a/testsuite/src/main/java/io/netty/testsuite/util/package-info.java b/testsuite/src/test/java/io/netty/testsuite/util/package-info.java
similarity index 100%
rename from testsuite/src/main/java/io/netty/testsuite/util/package-info.java
rename to testsuite/src/test/java/io/netty/testsuite/util/package-info.java