diff --git a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
index 47d594c4c02..15a9eba7d17 100644
--- a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
+++ b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java
@@ -3,7 +3,7 @@
 import org.junit.Test;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index 19b933d174c..78b54798cd1 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -16,8 +16,8 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
diff --git a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
index 2d414aecb3b..524d3f6c34c 100644
--- a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
+++ b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
@@ -37,7 +37,7 @@ private void runTest(AmazonDynamoDB client) {
                         "Name", ScalarAttributeType.S))
                 .withKeySchema(new KeySchemaElement("Name", KeyType.HASH))
                 .withProvisionedThroughput(new ProvisionedThroughput(
-                        new Long(10), new Long(10)))
+                    10L, 10L))
                 .withTableName("foo");
 
 
@@ -49,4 +49,4 @@ private void runTest(AmazonDynamoDB client) {
         assertEquals("the table has the right name", "foo", tableDescription.getTableName());
         assertEquals("the name has the right primary key", "Name", tableDescription.getKeySchema().get(0).getAttributeName());
     }
-}
\ No newline at end of file
+}