Use the JUnit 5 convention for class visibility
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemFactoryTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemFactoryTest.java
index 0a1c008..edd970a 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemFactoryTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemFactoryTest.java
@@ -26,7 +26,7 @@
/**
* Tests for {@link DiskFileItem}.
*/
-public class DiskFileItemFactoryTest {
+class DiskFileItemFactoryTest {
@Test
void testHeaders() {
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemSerializeTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemSerializeTest.java
index 2ec55db..fa5687e 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemSerializeTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemSerializeTest.java
@@ -41,7 +41,7 @@
/**
* Serialization Unit tests for {@link DiskFileItem}.
*/
-public class DiskFileItemSerializeTest {
+class DiskFileItemSerializeTest {
/**
* Use a private repository to catch any files left over by tests.
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemTest.java
index 1f6d188..ba99db5 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/DiskFileItemTest.java
@@ -26,7 +26,7 @@
/**
* Tests for {@link DiskFileItem}.
*/
-public class DiskFileItemTest {
+class DiskFileItemTest {
@Test
void testBuilderHeaders() {
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/FileItemHeadersTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/FileItemHeadersTest.java
index 2db491e..9d04efa 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/FileItemHeadersTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/FileItemHeadersTest.java
@@ -28,7 +28,7 @@
/**
* Tests {@link FileItemHeaders} and {@link FileItemHeadersImpl}.
*/
-public class FileItemHeadersTest {
+class FileItemHeadersTest {
/**
* @throws Exception
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MockRequestContextTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MockRequestContextTest.java
index 19f3f9b..d0948bd 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MockRequestContextTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MockRequestContextTest.java
@@ -29,7 +29,7 @@
/**
* Tests for {@link AbstractRequestContext}
*/
-public class MockRequestContextTest {
+class MockRequestContextTest {
private static final class MockRequestContext extends AbstractRequestContext<Object> {
private final String characterEncoding;
private final String contentType;
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MultipartStreamTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MultipartStreamTest.java
index 7a70ece..c3b9938 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MultipartStreamTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/MultipartStreamTest.java
@@ -32,7 +32,7 @@
/**
* Tests {@link MultipartInput}.
*/
-public class MultipartStreamTest {
+class MultipartStreamTest {
static private final String BOUNDARY_TEXT = "myboundary";
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/ParameterParserTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/ParameterParserTest.java
index 159ad77..1c89bf3 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/ParameterParserTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/core/ParameterParserTest.java
@@ -26,7 +26,7 @@
/**
* Tests for {@link ParameterParser}.
*/
-public class ParameterParserTest {
+class ParameterParserTest {
@Test
void testContentTypeParsing() {
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java
index 9b703a5..b156f02 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java
@@ -28,7 +28,7 @@
/**
* Tests the {@link ProgressListener}.
*/
-public class JakartaProgressListenerDiskTest extends
+class JakartaProgressListenerDiskTest extends
AbstractProgressListenerTest<JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java
index c890885..f7f7ee4 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java
@@ -28,7 +28,7 @@
/**
* Tests the {@link ProgressListener}.
*/
-public class JakartaProgressListenerTest extends
+class JakartaProgressListenerTest extends
AbstractProgressListenerTest<JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java
index 70b97cb..54347e9 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java
@@ -36,7 +36,7 @@
*
* @see AbstractFileUploadTest
*/
-public class JakartaServletFileUploadDiskTest
+class JakartaServletFileUploadDiskTest
extends AbstractFileUploadTest<JakartaServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
public JakartaServletFileUploadDiskTest() {
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java
index 3255913..666310e 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java
@@ -37,7 +37,7 @@
*
* @see AbstractFileUploadTest
*/
-public class JakartaServletFileUploadTest
+class JakartaServletFileUploadTest
extends AbstractFileUploadTest<JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
public JakartaServletFileUploadTest() {
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java
index 4d4f105..72ccd31 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JakartaSizesDiskTest extends AbstractSizesTest<JakartaServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
+class JakartaSizesDiskTest extends AbstractSizesTest<JakartaServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
protected JakartaServletDiskFileUpload newFileUpload() {
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java
index f107819..2f1a41a 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JakartaSizesTest
+class JakartaSizesTest
extends AbstractSizesTest<JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java
index f9a1501..0e459e5 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JakartaStreamingDiskTest
+class JakartaStreamingDiskTest
extends AbstractStreamingTest<JakartaServletDiskFileUpload, HttpServletRequest, JakartaServletRequestContext, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java
index 8e85a89..f0b9889 100644
--- a/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java
+++ b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JakartaStreamingTest extends
+class JakartaStreamingTest extends
AbstractStreamingTest<JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, JakartaServletRequestContext, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java
index 56203c5..5c0bcea 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java
@@ -28,7 +28,7 @@
/**
* Tests the {@link ProgressListener}.
*/
-public class JakartaProgressListenerDiskTest extends
+class JakartaProgressListenerDiskTest extends
AbstractProgressListenerTest<JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java
index 8347792..4676c97 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java
@@ -28,7 +28,7 @@
/**
* Tests the {@link ProgressListener}.
*/
-public class JakartaProgressListenerTest extends
+class JakartaProgressListenerTest extends
AbstractProgressListenerTest<JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java
index a692f9f..175dd71 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java
@@ -36,7 +36,7 @@
*
* @see AbstractFileUploadTest
*/
-public class JakartaServletFileUploadDiskTest
+class JakartaServletFileUploadDiskTest
extends AbstractFileUploadTest<JakartaServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
public JakartaServletFileUploadDiskTest() {
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java
index d217741..b812004 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java
@@ -36,7 +36,7 @@
*
* @see AbstractFileUploadTest
*/
-public class JakartaServletFileUploadTest
+class JakartaServletFileUploadTest
extends AbstractFileUploadTest<JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
public JakartaServletFileUploadTest() {
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java
index ded1407..ce9cee9 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JakartaSizesDiskTest extends AbstractSizesTest<JakartaServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
+class JakartaSizesDiskTest extends AbstractSizesTest<JakartaServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
protected JakartaServletDiskFileUpload newFileUpload() {
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java
index 4aa6ed8..0b596a3 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JakartaSizesTest
+class JakartaSizesTest
extends AbstractSizesTest<JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java
index 576aff5..8caebf6 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JakartaStreamingDiskTest
+class JakartaStreamingDiskTest
extends AbstractStreamingTest<JakartaServletDiskFileUpload, HttpServletRequest, JakartaServletRequestContext, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java
index c141e45..3c2d037 100644
--- a/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java
+++ b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JakartaStreamingTest extends
+class JakartaStreamingTest extends
AbstractStreamingTest<JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, JakartaServletRequestContext, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerDiskTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerDiskTest.java
index 00444d8..24b2729 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerDiskTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerDiskTest.java
@@ -28,7 +28,7 @@
/**
* Tests the {@link ProgressListener}.
*/
-public class JavaxProgressListenerDiskTest
+class JavaxProgressListenerDiskTest
extends AbstractProgressListenerTest<JavaxServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerTest.java
index de29765..edf1da1 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxProgressListenerTest.java
@@ -28,7 +28,7 @@
/**
* Tests the {@link ProgressListener}.
*/
-public class JavaxProgressListenerTest
+class JavaxProgressListenerTest
extends AbstractProgressListenerTest<JavaxServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadDiskTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadDiskTest.java
index c882d54..d1da2e8 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadDiskTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadDiskTest.java
@@ -39,7 +39,7 @@
*
* @see AbstractFileUploadTest
*/
-public class JavaxServletFileUploadDiskTest extends AbstractFileUploadTest<JavaxServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
+class JavaxServletFileUploadDiskTest extends AbstractFileUploadTest<JavaxServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
public JavaxServletFileUploadDiskTest() {
super(new JavaxServletDiskFileUpload());
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java
index 49daf91..29019da 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java
@@ -39,7 +39,7 @@
*
* @see AbstractFileUploadTest
*/
-public class JavaxServletFileUploadTest
+class JavaxServletFileUploadTest
extends AbstractFileUploadTest<JavaxServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
public JavaxServletFileUploadTest() {
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesDiskTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesDiskTest.java
index 65d4301..ebb96c9 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesDiskTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesDiskTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JavaxSizesDiskTest extends AbstractSizesTest<JavaxServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
+class JavaxSizesDiskTest extends AbstractSizesTest<JavaxServletDiskFileUpload, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
protected JavaxServletDiskFileUpload newFileUpload() {
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesTest.java
index 0281a26..9c8d0c5 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxSizesTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JavaxSizesTest
+class JavaxSizesTest
extends AbstractSizesTest<JavaxServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingDiskTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingDiskTest.java
index 9ca7ccd..1fdeb20 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingDiskTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingDiskTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JavaxStreamingDiskTest
+class JavaxStreamingDiskTest
extends AbstractStreamingTest<JavaxServletDiskFileUpload, HttpServletRequest, JavaxServletRequestContext, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java
index d299efc..5a17d42 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java
@@ -27,7 +27,7 @@
/**
* Unit test for items with varying sizes.
*/
-public class JavaxStreamingTest extends
+class JavaxStreamingTest extends
AbstractStreamingTest<JavaxServletFileUpload<DiskFileItem, DiskFileItemFactory>, HttpServletRequest, JavaxServletRequestContext, DiskFileItem, DiskFileItemFactory> {
@Override
diff --git a/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUploadTest.java b/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUploadTest.java
index 2534ed8..3e060cb 100644
--- a/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUploadTest.java
+++ b/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUploadTest.java
@@ -36,7 +36,7 @@
*
* @see AbstractFileUploadTest
*/
-public class JavaxPortletFileUploadTest
+class JavaxPortletFileUploadTest
extends AbstractFileUploadTest<JavaxPortletFileUpload<DiskFileItem, DiskFileItemFactory>, ActionRequest, DiskFileItem, DiskFileItemFactory> {
public JavaxPortletFileUploadTest() {
