diff --git a/plugin/pom.xml b/plugin/pom.xml
index 9afd74e..658477e 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -175,7 +175,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.15.3</version>
+            <version>1.19.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/plugin/src/test/java/org/opennms/timeseries/cortex/CortexTSSIntegrationTest.java b/plugin/src/test/java/org/opennms/timeseries/cortex/CortexTSSIntegrationTest.java
index d95403b..8515e99 100644
--- a/plugin/src/test/java/org/opennms/timeseries/cortex/CortexTSSIntegrationTest.java
+++ b/plugin/src/test/java/org/opennms/timeseries/cortex/CortexTSSIntegrationTest.java
@@ -38,7 +38,6 @@
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.shaded.org.apache.commons.lang.NotImplementedException;
 
 public class CortexTSSIntegrationTest extends AbstractStorageIntegrationTest {
 
diff --git a/plugin/src/test/java/org/opennms/timeseries/cortex/KVStoreMock.java b/plugin/src/test/java/org/opennms/timeseries/cortex/KVStoreMock.java
index 34f8ec7..e7f199d 100644
--- a/plugin/src/test/java/org/opennms/timeseries/cortex/KVStoreMock.java
+++ b/plugin/src/test/java/org/opennms/timeseries/cortex/KVStoreMock.java
@@ -1,7 +1,6 @@
 package org.opennms.timeseries.cortex;
 
 import org.opennms.integration.api.v1.distributed.KeyValueStore;
-import org.testcontainers.shaded.org.apache.commons.lang.NotImplementedException;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,12 +32,12 @@ public Optional get(String key, String context) {
 
         @Override
         public Optional getIfStale(String key, String context, long timestamp) {
-            throw new NotImplementedException();
+            throw new RuntimeException();
         }
 
         @Override
         public OptionalLong getLastUpdated(String key, String context) {
-            throw new NotImplementedException();
+            throw new RuntimeException();
         }
 
         @Override
@@ -48,12 +47,12 @@ public Map enumerateContext(String context) {
 
         @Override
         public void delete(String key, String context) {
-            throw new NotImplementedException();
+            throw new RuntimeException();
         }
 
         @Override
         public void truncateContext(String context) {
-            throw new NotImplementedException();
+            throw new RuntimeException();
         }
 
         @Override
@@ -70,17 +69,17 @@ public CompletableFuture<Long> putAsync(String key, Object value, String context
 
         @Override
         public CompletableFuture<Optional> getAsync(String key, String context) {
-            throw new NotImplementedException();
+            throw new RuntimeException();
         }
 
         @Override
         public CompletableFuture<Optional> getIfStaleAsync(String key, String context, long timestamp) {
-            throw new NotImplementedException();
+            throw new RuntimeException();
         }
 
         @Override
         public CompletableFuture<OptionalLong> getLastUpdatedAsync(String key, String context) {
-            throw new NotImplementedException();
+            throw new RuntimeException();
         }
 
         @Override
@@ -95,12 +94,12 @@ public CompletableFuture<Map> enumerateContextAsync(String context) {
 
         @Override
         public CompletableFuture<Void> deleteAsync(String key, String context) {
-            throw new NotImplementedException();
+            throw new RuntimeException();
         }
 
         @Override
         public CompletableFuture<Void> truncateContextAsync(String context) {
-            throw new NotImplementedException();
+            throw new RuntimeException();
         }
 
 }