diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
index 1ed5e954e44..990940be14d 100644
--- a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
+++ b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
-import org.junit.jupiter.api.extension.TestInstancePostProcessor;
 import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.util.AnnotationUtils;
 import org.junit.platform.commons.util.Preconditions;
@@ -23,7 +22,8 @@
 import org.testcontainers.lifecycle.TestLifecycleAware;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
@@ -34,20 +34,13 @@
 import static java.util.stream.Collectors.toList;
 import static org.testcontainers.junit.jupiter.FilesystemFriendlyNameGenerator.filesystemFriendlyNameOf;
 
-class TestcontainersExtension implements BeforeEachCallback, BeforeAllCallback, AfterEachCallback, AfterAllCallback, ExecutionCondition, TestInstancePostProcessor {
+class TestcontainersExtension implements BeforeEachCallback, BeforeAllCallback, AfterEachCallback, AfterAllCallback, ExecutionCondition {
 
     private static final Namespace NAMESPACE = Namespace.create(TestcontainersExtension.class);
 
-    private static final String TEST_INSTANCE = "testInstance";
     private static final String SHARED_LIFECYCLE_AWARE_CONTAINERS = "sharedLifecycleAwareContainers";
     private static final String LOCAL_LIFECYCLE_AWARE_CONTAINERS = "localLifecycleAwareContainers";
 
-    @Override
-    public void postProcessTestInstance(final Object testInstance, final ExtensionContext context) {
-        Store store = context.getStore(NAMESPACE);
-        store.put(TEST_INSTANCE, testInstance);
-    }
-
     @Override
     public void beforeAll(ExtensionContext context) {
         Class<?> testClass = context.getTestClass()
@@ -156,17 +149,9 @@ boolean isDockerAvailable() {
     }
 
     private Set<Object> collectParentTestInstances(final ExtensionContext context) {
-        Set<Object> testInstances = new LinkedHashSet<>();
-        Optional<ExtensionContext> current = Optional.of(context);
-        while (current.isPresent()) {
-            ExtensionContext ctx = current.get();
-            Object testInstance = ctx.getStore(NAMESPACE).remove(TEST_INSTANCE);
-            if (testInstance != null) {
-                testInstances.add(testInstance);
-            }
-            current = ctx.getParent();
-        }
-        return testInstances;
+        List<Object> allInstances = new ArrayList<>(context.getRequiredTestInstances().getAllInstances());
+        Collections.reverse(allInstances);
+        return new LinkedHashSet<>(allInstances);
     }
 
     private List<StoreAdapter> findSharedContainers(Class<?> testClass) {