diff --git a/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
index 562c0c0e19..057de63cbc 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
@@ -29,7 +29,6 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * @since 1.15
  */
 public class Base16InputStreamTest {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
index 324e3abde1..59f582af5b 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
@@ -27,7 +27,6 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * @since 1.15
  */
 public class Base16OutputStreamTest {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16Test.java b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
index f53a41ffa5..6695f7ed49 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
@@ -37,7 +37,6 @@
 /**
  * Test cases for Base16 class.
  *
- * @since 1.15
  */
 public class Base16Test {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16TestData.java b/src/test/java/org/apache/commons/codec/binary/Base16TestData.java
index 09be1cae3d..ea2e708033 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16TestData.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16TestData.java
@@ -21,7 +21,6 @@
  * This random data was encoded by OpenSSL. Java had nothing to do with it. This data helps us test interop between
  * Commons-Codec and OpenSSL.
  *
- * @since 1.15
  */
 public class Base16TestData {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base32TestData.java b/src/test/java/org/apache/commons/codec/binary/Base32TestData.java
index 10ad70ee95..3ff4042cb8 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32TestData.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32TestData.java
@@ -22,7 +22,6 @@
  * Commons-Codec and OpenSSL. Notice that OpenSSL creates 64 character lines instead of the 76 of Commons-Codec.
  *
  * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
- * @since 1.4
  */
 public class Base32TestData {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
index 7e1541108d..ff915ea8cb 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
@@ -35,7 +35,6 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * @since 1.4
  */
 public class Base64InputStreamTest {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
index ddb946ba9c..a16f061ce4 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * @since 1.4
  */
 public class Base64OutputStreamTest {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64TestData.java b/src/test/java/org/apache/commons/codec/binary/Base64TestData.java
index 903645a47d..43bd072987 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64TestData.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64TestData.java
@@ -22,7 +22,6 @@
  * Commons-Codec and OpenSSL. Notice that OpenSSL creates 64 character lines instead of the 76 of Commons-Codec.
  *
  * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
- * @since 1.4
  */
 public class Base64TestData {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/BaseNTestData.java b/src/test/java/org/apache/commons/codec/binary/BaseNTestData.java
index 24e7bd7286..946d98c69f 100644
--- a/src/test/java/org/apache/commons/codec/binary/BaseNTestData.java
+++ b/src/test/java/org/apache/commons/codec/binary/BaseNTestData.java
@@ -25,7 +25,6 @@
 /**
  * Data and functions common to BaseN tests.
  *
- * @since 1.15
  */
 public class BaseNTestData {
 
diff --git a/src/test/java/org/apache/commons/codec/cli/DigestTest.java b/src/test/java/org/apache/commons/codec/cli/DigestTest.java
index 41e9805051..b5bf88e350 100644
--- a/src/test/java/org/apache/commons/codec/cli/DigestTest.java
+++ b/src/test/java/org/apache/commons/codec/cli/DigestTest.java
@@ -24,7 +24,6 @@
 /**
  * Tests {@link Digest}.
  *
- * @since 1.17
  */
 public class DigestTest {
 
diff --git a/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java b/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
index 65b8d4eb34..f342b79b2f 100644
--- a/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
@@ -44,7 +44,6 @@
 /**
  * Tests {@link HmacAlgorithms}.
  *
- * @since 1.11
  */
 public class HmacAlgorithmsTest {
 
diff --git a/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java b/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
index 908573536d..58a291f6a1 100644
--- a/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
@@ -45,7 +45,6 @@
 /**
  * Tests {@link MessageDigestAlgorithms}.
  *
- * @since 1.11
  */
 public class MessageDigestAlgorithmsTest {
 
diff --git a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
index 9a65e26943..b951fb2bec 100644
--- a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
@@ -38,7 +38,6 @@
  *
  * Copied from Hadoop 2.6.3 (Renamed TestPureJavaCrc32 to PureJavaCrc32Test).
  *
- * @since 1.11
  */
 public class PureJavaCrc32Test {
 
diff --git a/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java b/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java
index 26a0c33858..3bf3585f14 100644
--- a/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java
+++ b/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java
@@ -27,7 +27,6 @@
 /**
  * Tests Caverphone1.
  *
- * @since 1.5
  */
 public class Caverphone1Test extends AbstractStringEncoderTest<Caverphone1> {
 
diff --git a/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java b/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
index fd55d2e7f4..5b3345cf33 100644
--- a/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
+++ b/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
@@ -27,7 +27,6 @@
 /**
  * Tests Caverphone2.
  *
- * @since 1.5
  */
 public class Caverphone2Test extends AbstractStringEncoderTest<Caverphone2> {
 
diff --git a/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java b/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
index c248bdfed6..ce05dbd1b1 100644
--- a/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
+++ b/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
@@ -28,7 +28,6 @@
  * Keep this file in UTF-8 encoding for proper Javadoc processing.
  * </p>
  *
- * @since 1.10
  */
 public class DaitchMokotoffSoundexTest extends AbstractStringEncoderTest<DaitchMokotoffSoundex> {
 
diff --git a/src/test/java/org/apache/commons/codec/language/NysiisTest.java b/src/test/java/org/apache/commons/codec/language/NysiisTest.java
index 8fe478e3ab..a9e9faae64 100644
--- a/src/test/java/org/apache/commons/codec/language/NysiisTest.java
+++ b/src/test/java/org/apache/commons/codec/language/NysiisTest.java
@@ -26,7 +26,6 @@
 /**
  * Tests {@link Nysiis}
  *
- * @since 1.7
  */
 public class NysiisTest extends AbstractStringEncoderTest<Nysiis> {
 
diff --git a/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java b/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
index 08d30aad35..1710f27daf 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
@@ -34,7 +34,6 @@
 /**
  * Tests BeiderMorseEncoder.
  *
- * @since 1.6
  */
 public class BeiderMorseEncoderTest extends AbstractStringEncoderTest<StringEncoder> {
     private static final char[] TEST_CHARS = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'o', 'u' };
diff --git a/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java b/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
index ad291cfb4c..20ab076fd2 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
@@ -28,7 +28,6 @@
 /**
  * Tests guessLanguages API.
  *
- * @since 1.6
  */
 public class LanguageGuessingTest {
 
diff --git a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java
index 3207dbe38d..a1dae52319 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java
@@ -29,7 +29,6 @@
 /**
  * Tests PhoneticEngine and Languages.LanguageSet in ways very similar to code found in solr-3.6.0.
  *
- * @since 1.7
  */
 public class PhoneticEngineRegressionTest {
 
diff --git a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
index 1a7c2117fa..a158f260a4 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
@@ -29,7 +29,6 @@
 /**
  * Tests PhoneticEngine.
  *
- * @since 1.6
  */
 public class PhoneticEngineTest {
 
diff --git a/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java b/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
index 48b7a492f9..3eebd518db 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
@@ -25,7 +25,6 @@
 /**
  * Tests Rule.
  *
- * @since 1.6
  */
 public class RuleTest {
     private Rule.Phoneme[][] makePhonemes() {
diff --git a/src/test/java/org/apache/commons/codec/net/UtilsTest.java b/src/test/java/org/apache/commons/codec/net/UtilsTest.java
index f74ad4eca7..4b29dfb48b 100644
--- a/src/test/java/org/apache/commons/codec/net/UtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/net/UtilsTest.java
@@ -25,7 +25,6 @@
  * Methods currently get 100%/100% line/branch code coverage from other tests classes.
  * </p>
  *
- * @since 1.4
  */
 public class UtilsTest {