diff --git a/config/suppressions.xml b/config/suppressions.xml
index 4eaa0b979..6f8e25b0b 100644
--- a/config/suppressions.xml
+++ b/config/suppressions.xml
@@ -10,4 +10,6 @@ it disabled until gradle uses a checkstyle version where this is fixed
-->
+
+
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/filter/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/filter/package-info.java
deleted file mode 120000
index 4de3717bb..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/filter/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smack/filter/package-info.java
\ No newline at end of file
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/package-info.java
deleted file mode 120000
index 0e977330c..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../main/java/org/jivesoftware/smack/package-info.java
\ No newline at end of file
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/package-info.java
deleted file mode 120000
index 7dc152722..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/packet/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smack/packet/package-info.java
\ No newline at end of file
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/parsing/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/parsing/package-info.java
deleted file mode 120000
index 2b00b7277..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/parsing/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smack/parsing/package-info.java
\ No newline at end of file
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/provider/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/provider/package-info.java
deleted file mode 120000
index 963eb3788..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smack/provider/package-info.java
\ No newline at end of file
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/sasl/core/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/sasl/core/package-info.java
deleted file mode 120000
index 6ec78b204..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/sasl/core/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smack/sasl/core/package-info.java
\ No newline at end of file
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/sasl/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/sasl/package-info.java
deleted file mode 120000
index 3c211fd88..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/sasl/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smack/sasl/package-info.java
\ No newline at end of file
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/test/package-info.java
deleted file mode 100644
index 4379d6162..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/test/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- *
- * Copyright 2015 Florian Schmaus
- *
- * Licensed 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.
- */
-
-/**
- * TODO describe me.
- */
-package org.jivesoftware.smack.test;
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/util/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/package-info.java
deleted file mode 100644
index ee4648bd8..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/test/util/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- *
- * Copyright 2015 Florian Schmaus
- *
- * Licensed 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.
- */
-
-/**
- * TODO describe me.
- */
-package org.jivesoftware.smack.test.util;
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/util/package-info.java
deleted file mode 120000
index b6d2f5bdb..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smack/util/package-info.java
\ No newline at end of file
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/stringencoder/package-info.java b/smack-core/src/test/java/org/jivesoftware/smack/util/stringencoder/package-info.java
deleted file mode 120000
index 47ca07aae..000000000
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/stringencoder/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smack/util/stringencoder/package-info.java
\ No newline at end of file
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/package-info.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/package-info.java
deleted file mode 120000
index 6f12b530f..000000000
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/carbons/package-info.java
\ No newline at end of file
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/package-info.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/package-info.java
deleted file mode 120000
index 85c018622..000000000
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/hoxt/provider/package-info.java
\ No newline at end of file
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/package-info.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/package-info.java
deleted file mode 120000
index f0646658f..000000000
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/package-info.java
deleted file mode 120000
index 003c570d3..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/amp/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/package-info.java
deleted file mode 120000
index 9f5d2fc17..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/bytestreams/ibb/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/package-info.java
deleted file mode 120000
index 8b2133ee1..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/package-info.java
deleted file mode 120000
index a2b86120b..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/package-info.java
deleted file mode 120000
index 8ad1db26e..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/bytestreams/socks5/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/package-info.java
deleted file mode 120000
index 623f5b9a7..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/caps/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/provider/package-info.java
deleted file mode 120000
index 9bee449cd..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/caps/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/package-info.java
deleted file mode 120000
index 60dcc6628..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/delay/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/package-info.java
deleted file mode 120000
index 2805e9cf4..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/delay/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/package-info.java
deleted file mode 120000
index 82fc9a3f3..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/filetransfer/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/package-info.java
deleted file mode 120000
index 77bde8a59..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/forward/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/package-info.java
deleted file mode 120000
index c6a9b56b5..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/geoloc/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/package-info.java
deleted file mode 120000
index 0342e2bf9..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/geoloc/packet/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/provider/package-info.java
deleted file mode 120000
index 1f7ee9458..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/geoloc/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/iqlast/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/iqlast/package-info.java
deleted file mode 120000
index a1535565f..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/iqlast/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/iqlast/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/iqversion/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/iqversion/package-info.java
deleted file mode 120000
index 02e1f165e..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/iqversion/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/iqversion/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/package-info.java
deleted file mode 120000
index 36de2a400..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/jiveproperties/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/package-info.java
deleted file mode 120000
index 47b389996..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/muc/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/packet/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/packet/package-info.java
deleted file mode 120000
index 9a84d4c1e..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/packet/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/muc/packet/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/package-info.java
deleted file mode 120000
index 1820e76ca..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../main/java/org/jivesoftware/smackx/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/ping/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/ping/package-info.java
deleted file mode 120000
index d866d7544..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/ping/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/ping/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/package-info.java
deleted file mode 120000
index eebd73eeb..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/privacy/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/package-info.java
deleted file mode 120000
index b2558b6e3..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/privacy/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/package-info.java
deleted file mode 120000
index 7385b90b3..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/pubsub/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/provider/package-info.java
deleted file mode 120000
index d3f808acd..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/pubsub/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/package-info.java
deleted file mode 120000
index f6aa97e6e..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/receipts/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/package-info.java
deleted file mode 120000
index 70624c04d..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/rsm/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/provider/package-info.java
deleted file mode 120000
index 3190ced5e..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/rsm/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/package-info.java
deleted file mode 120000
index d528c873f..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/shim/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/package-info.java
deleted file mode 120000
index d1b892f27..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/shim/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/time/package-info.java
deleted file mode 120000
index 66a064eb4..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/time/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/packet/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/time/packet/package-info.java
deleted file mode 120000
index 390c48e83..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/packet/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/time/packet/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/package-info.java
deleted file mode 120000
index c54928e83..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/time/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/vcardtemp/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/vcardtemp/package-info.java
deleted file mode 120000
index b630b1a40..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/vcardtemp/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/vcardtemp/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/package-info.java
deleted file mode 120000
index 23eab2656..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/xdata/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/package-info.java
deleted file mode 120000
index 025388ee8..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/xdata/packet/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/package-info.java
deleted file mode 120000
index 3e294407f..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/xdatalayout/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/package-info.java
deleted file mode 120000
index 7bb3f27e3..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/xdatalayout/packet/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/package-info.java
deleted file mode 120000
index a2bb682b8..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/xdatavalidation/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/package-info.java
deleted file mode 120000
index e7cf15e01..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/xdatavalidation/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/package-info.java
deleted file mode 120000
index b373bbe7c..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smackx/xhtmlim/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/package-info.java
deleted file mode 120000
index 84c223362..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smackx/xhtmlim/provider/package-info.java
\ No newline at end of file
diff --git a/smack-extensions/src/test/java/org/jivesoftware/util/package-info.java b/smack-extensions/src/test/java/org/jivesoftware/util/package-info.java
deleted file mode 100644
index d264a1fbb..000000000
--- a/smack-extensions/src/test/java/org/jivesoftware/util/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- *
- * Copyright 2015 Florian Schmaus
- *
- * Licensed 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.
- */
-
-/**
- * This packaged should get removed eventually.
- */
-package org.jivesoftware.util;
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/chat/package-info.java b/smack-im/src/test/java/org/jivesoftware/smack/chat/package-info.java
deleted file mode 120000
index 642736b41..000000000
--- a/smack-im/src/test/java/org/jivesoftware/smack/chat/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smack/chat/package-info.java
\ No newline at end of file
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/im/package-info.java b/smack-im/src/test/java/org/jivesoftware/smack/im/package-info.java
deleted file mode 120000
index 714bba72b..000000000
--- a/smack-im/src/test/java/org/jivesoftware/smack/im/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smack/im/package-info.java
\ No newline at end of file
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/package-info.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/package-info.java
deleted file mode 120000
index a9d255448..000000000
--- a/smack-im/src/test/java/org/jivesoftware/smack/roster/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smack/roster/package-info.java
\ No newline at end of file
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/rosterstore/package-info.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/rosterstore/package-info.java
deleted file mode 120000
index eb65d43e9..000000000
--- a/smack-im/src/test/java/org/jivesoftware/smack/roster/rosterstore/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smack/roster/rosterstore/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/package-info.java b/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/package-info.java
deleted file mode 120000
index b490ccef1..000000000
--- a/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/igniterealtime/smack/inttest/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/unittest/package-info.java b/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/unittest/package-info.java
deleted file mode 100644
index f81afaa3c..000000000
--- a/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/unittest/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- *
- * Copyright 2015 Florian Schmaus
- *
- * Licensed 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.
- */
-
-/**
- * Unit tests for the Smack Integration Test Framework.
- */
-package org.igniterealtime.smack.inttest.unittest;
diff --git a/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/util/package-info.java b/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/util/package-info.java
deleted file mode 120000
index a428e7f2a..000000000
--- a/smack-integration-test/src/test/java/org/igniterealtime/smack/inttest/util/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/igniterealtime/smack/inttest/util/package-info.java
\ No newline at end of file
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/package-info.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/package-info.java
deleted file mode 100644
index e04f1fed1..000000000
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- *
- * Copyright 2015 Florian Schmaus
- *
- * Licensed 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.
- */
-
-/**
- * TODO describe me.
- */
-package org.jivesoftware.smackx.jingleold.mediaimpl.test;
diff --git a/smack-legacy/src/test/java/org/jivesoftware/smackx/package-info.java b/smack-legacy/src/test/java/org/jivesoftware/smackx/package-info.java
deleted file mode 120000
index f0646658f..000000000
--- a/smack-legacy/src/test/java/org/jivesoftware/smackx/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/package-info.java
\ No newline at end of file
diff --git a/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/package-info.java b/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/package-info.java
deleted file mode 120000
index 52a93694f..000000000
--- a/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smack/sasl/javax/package-info.java
\ No newline at end of file
diff --git a/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/package-info.java b/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/package-info.java
deleted file mode 120000
index 4fac9b2e9..000000000
--- a/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smack/sasl/provided/package-info.java
\ No newline at end of file
diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/package-info.java b/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/package-info.java
deleted file mode 120000
index 6b4edbeca..000000000
--- a/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../main/java/org/jivesoftware/smack/sm/provider/package-info.java
\ No newline at end of file
diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/package-info.java b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/package-info.java
deleted file mode 120000
index bcb093949..000000000
--- a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../main/java/org/jivesoftware/smack/tcp/package-info.java
\ No newline at end of file