diff --git a/pom.xml b/pom.xml
index 95d75a0d1..5d1fb0826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
         <geojson-jackson.version>1.14</geojson-jackson.version>
         <apache-commons-csv.version>1.9.0</apache-commons-csv.version>
         <apache-commons-lang.version>3.12.0</apache-commons-lang.version>
-        <testcontainers.version>1.21.4</testcontainers.version>
+        <testcontainers.version>2.0.3</testcontainers.version>
         <!-- Version of flyway dependent on version of micronaut -->
         <flyway.version>7.7.3</flyway.version>
         <guava.version>31.0.1-jre</guava.version>
@@ -357,7 +357,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>localstack</artifactId>
+            <artifactId>testcontainers-localstack</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
@@ -541,16 +541,6 @@
                     <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- Temporary: skip Gigwa IT until the Gigwa image issue is resolved -->
-                    <excludes>
-                        <exclude>**/GigwaGenotypeServiceImplIntegrationTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/AccessibilityControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/AccessibilityControllerIntegrationTest.java
index b111c6136..028aa7363 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/AccessibilityControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/AccessibilityControllerIntegrationTest.java
@@ -35,7 +35,7 @@
 import javax.inject.Inject;
 
 import static io.micronaut.http.HttpRequest.GET;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @MicronautTest
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/CountryControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/CountryControllerIntegrationTest.java
index 801361125..ba9566112 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/CountryControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/CountryControllerIntegrationTest.java
@@ -35,7 +35,7 @@
 import javax.inject.Inject;
 
 import static io.micronaut.http.HttpRequest.GET;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @MicronautTest
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/EnvironmentDataTypeControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/EnvironmentDataTypeControllerIntegrationTest.java
index a8100835a..4e9909167 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/EnvironmentDataTypeControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/EnvironmentDataTypeControllerIntegrationTest.java
@@ -35,7 +35,7 @@
 import javax.inject.Inject;
 
 import static io.micronaut.http.HttpRequest.GET;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @MicronautTest
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/ExperimentControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/ExperimentControllerIntegrationTest.java
index 21358e69d..1d437d12e 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/ExperimentControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/ExperimentControllerIntegrationTest.java
@@ -57,7 +57,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 import static io.micronaut.http.HttpRequest.*;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.*;
 
 @MicronautTest
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/ProgramControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/ProgramControllerIntegrationTest.java
index 32a044fae..1358563d6 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/ProgramControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/ProgramControllerIntegrationTest.java
@@ -33,7 +33,7 @@
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.test.annotation.MockBean;
 import io.reactivex.Flowable;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
 import lombok.SneakyThrows;
 import org.breedinginsight.BrAPITest;
 import org.breedinginsight.TestUtils;
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/RoleControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/RoleControllerIntegrationTest.java
index f5305b6e8..29bbe0e2b 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/RoleControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/RoleControllerIntegrationTest.java
@@ -35,7 +35,7 @@
 import javax.inject.Inject;
 
 import static io.micronaut.http.HttpRequest.GET;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @MicronautTest
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/TopographyControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/TopographyControllerIntegrationTest.java
index dd2881244..035a759d0 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/TopographyControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/TopographyControllerIntegrationTest.java
@@ -35,7 +35,7 @@
 import javax.inject.Inject;
 
 import static io.micronaut.http.HttpRequest.GET;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @MicronautTest
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java
index 08c7edd37..ae8254e9f 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java
@@ -30,7 +30,7 @@
 import io.micronaut.test.annotation.MockBean;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.reactivex.Flowable;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
 import lombok.SneakyThrows;
 import org.brapi.client.v2.ApiResponse;
 import org.brapi.client.v2.BrAPIClient;
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/TraitUploadControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/TraitUploadControllerIntegrationTest.java
index 01a478bdf..ba062535d 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/TraitUploadControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/TraitUploadControllerIntegrationTest.java
@@ -28,7 +28,7 @@
 import io.micronaut.http.netty.cookies.NettyCookie;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.reactivex.Flowable;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
 import org.breedinginsight.BrAPITest;
 import org.breedinginsight.DatabaseTest;
 import org.breedinginsight.TestUtils;
diff --git a/src/test/java/org/breedinginsight/api/v1/controller/UserControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/UserControllerIntegrationTest.java
index 4914824f3..28f6bca5b 100644
--- a/src/test/java/org/breedinginsight/api/v1/controller/UserControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/api/v1/controller/UserControllerIntegrationTest.java
@@ -31,7 +31,7 @@
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.micronaut.test.annotation.MockBean;
 import io.reactivex.Flowable;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
 import lombok.SneakyThrows;
 import org.breedinginsight.DatabaseTest;
 import org.breedinginsight.TestUtils;
@@ -45,7 +45,7 @@
 import org.breedinginsight.services.UserService;
 import org.breedinginsight.utilities.email.EmailUtil;
 import org.jooq.DSLContext;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.*;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -335,7 +335,7 @@ void postUsersWithRolesSuccess() {
             assertEquals(validSystemRole.getId().toString(), adminRole.get("id").getAsString(), "Inserted role id doesn't match what was passed.");
 
         } catch (IllegalStateException e) {
-            Assert.fail(e.getMessage());
+            Assertions.fail(e.getMessage());
         }
     }
 
@@ -371,7 +371,7 @@ public void postUsersNoRolesSuccess() {
             testUserUUID = result.get("id").getAsString();
 
         } catch (IllegalStateException e) {
-            Assert.fail(e.getMessage());
+            Assertions.fail(e.getMessage());
         }
     }
 
@@ -450,7 +450,7 @@ public void putUsersOwnEmailAlreadyExists() {
 
 
         } catch (IllegalStateException e) {
-            Assert.fail(e.getMessage());
+            Assertions.fail(e.getMessage());
         }
     }
 
diff --git a/src/test/java/org/breedinginsight/brapi/v2/GermplasmControllerIntegrationTest.java b/src/test/java/org/breedinginsight/brapi/v2/GermplasmControllerIntegrationTest.java
index 2a0ad750f..e283a2484 100644
--- a/src/test/java/org/breedinginsight/brapi/v2/GermplasmControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/brapi/v2/GermplasmControllerIntegrationTest.java
@@ -9,7 +9,7 @@
 import io.micronaut.http.netty.cookies.NettyCookie;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.reactivex.Flowable;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
 import lombok.SneakyThrows;
 import org.breedinginsight.BrAPITest;
 import org.breedinginsight.TestUtils;
diff --git a/src/test/java/org/breedinginsight/brapi/v2/ListControllerIntegrationTest.java b/src/test/java/org/breedinginsight/brapi/v2/ListControllerIntegrationTest.java
index b5ee8ce0d..d61ebe536 100644
--- a/src/test/java/org/breedinginsight/brapi/v2/ListControllerIntegrationTest.java
+++ b/src/test/java/org/breedinginsight/brapi/v2/ListControllerIntegrationTest.java
@@ -27,7 +27,7 @@
 import io.micronaut.http.netty.cookies.NettyCookie;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import io.reactivex.Flowable;
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
 import lombok.SneakyThrows;
 import org.breedinginsight.BrAPITest;
 import org.breedinginsight.TestUtils;
@@ -42,7 +42,6 @@
 import org.breedinginsight.model.Program;
 import org.breedinginsight.services.SpeciesService;
 import org.jooq.DSLContext;
-import org.junit.Rule;
 import org.junit.jupiter.api.*;
 
 import javax.inject.Inject;
diff --git a/src/test/java/org/breedinginsight/services/parsers/TraitFileParserUnitTest.java b/src/test/java/org/breedinginsight/services/parsers/TraitFileParserUnitTest.java
index e99587fd2..f2f87cb94 100644
--- a/src/test/java/org/breedinginsight/services/parsers/TraitFileParserUnitTest.java
+++ b/src/test/java/org/breedinginsight/services/parsers/TraitFileParserUnitTest.java
@@ -16,7 +16,7 @@
  */
 package org.breedinginsight.services.parsers;
 
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
 import lombok.SneakyThrows;
 import org.breedinginsight.api.model.v1.response.RowValidationErrors;
 import org.breedinginsight.api.model.v1.response.ValidationError;
diff --git a/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java b/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java
index 9eb1b727f..25f4afbe4 100644
--- a/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java
+++ b/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java
@@ -17,7 +17,7 @@
 
 package org.breedinginsight.services.validators;
 
-import junit.framework.AssertionFailedError;
+import org.opentest4j.AssertionFailedError;
 import lombok.SneakyThrows;
 import org.brapi.v2.model.pheno.BrAPIScaleValidValuesCategories;
 import org.breedinginsight.api.model.v1.response.RowValidationErrors;