diff --git a/build/pom.xml b/build/pom.xml
index a5add2d46..05b17ad77 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -67,6 +67,11 @@
         <artifactId>junit-jupiter-api</artifactId>
         <version>${version.junit5}</version>
       </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>${version.junit5}</version>
+      </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-engine</artifactId>
diff --git a/junit5/container/pom.xml b/junit5/container/pom.xml
index 774950f51..7a94277e6 100644
--- a/junit5/container/pom.xml
+++ b/junit5/container/pom.xml
@@ -80,6 +80,11 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionAndParameterizedTest.java b/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionAndParameterizedTest.java
new file mode 100644
index 000000000..39e04e364
--- /dev/null
+++ b/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/ClassWithArquillianExtensionAndParameterizedTest.java
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2021 Red Hat Inc. and/or its affiliates and other contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.junit5.container;
+
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.jboss.arquillian.junit5.container.JUnitTestBaseClass.Cycle;
+import static org.jboss.arquillian.junit5.container.JUnitTestBaseClass.wasCalled;
+
+@ExtendWith(ArquillianExtension.class)
+public class ClassWithArquillianExtensionAndParameterizedTest {
+
+  @BeforeAll
+  public static void beforeClass() throws Throwable {
+    wasCalled(Cycle.BEFORE_CLASS);
+  }
+
+  @AfterAll
+  public static void afterClass() throws Throwable {
+    wasCalled(Cycle.AFTER_CLASS);
+  }
+
+  @BeforeEach
+  public void before() throws Throwable {
+    wasCalled(Cycle.BEFORE);
+  }
+
+  @AfterEach
+  public void after() throws Throwable {
+    wasCalled(Cycle.AFTER);
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"one", "two"})
+  public void failingTest() throws Throwable {
+    wasCalled(Cycle.TEST);
+    Assertions.fail("Intentionally failing the test.");
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"one", "two"})
+  public void succeedingTest() throws Throwable {
+    wasCalled(Cycle.TEST);
+  }
+}
diff --git a/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitParameterizedTestCase.java b/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitParameterizedTestCase.java
new file mode 100644
index 000000000..eacd78b46
--- /dev/null
+++ b/junit5/container/src/test/java/org/jboss/arquillian/junit5/container/JUnitParameterizedTestCase.java
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2021 Red Hat Inc. and/or its affiliates and other contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.junit5.container;
+
+import org.jboss.arquillian.test.spi.LifecycleMethodExecutor;
+import org.jboss.arquillian.test.spi.TestMethodExecutor;
+import org.jboss.arquillian.test.spi.TestResult;
+import org.jboss.arquillian.test.spi.TestRunnerAdaptor;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.launcher.listeners.TestExecutionSummary;
+import org.mockito.invocation.InvocationOnMock;
+
+import java.lang.reflect.Method;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+
+public class JUnitParameterizedTestCase extends JUnitTestBaseClass {
+
+    @Override
+    protected void executeAllLifeCycles(TestRunnerAdaptor adaptor) throws Exception {
+        doAnswer(new ExecuteLifecycle()).when(adaptor).beforeClass(any(Class.class), any(LifecycleMethodExecutor.class));
+        doAnswer(new ExecuteLifecycle()).when(adaptor).afterClass(any(Class.class), any(LifecycleMethodExecutor.class));
+        doAnswer(new ExecuteLifecycle()).when(adaptor).before(any(Object.class), any(Method.class),
+                any(LifecycleMethodExecutor.class));
+        doAnswer(new ExecuteLifecycle()).when(adaptor).after(any(Object.class), any(Method.class),
+                any(LifecycleMethodExecutor.class));
+        doAnswer(new TestExecuteLifecycle()).when(adaptor).test(any(TestMethodExecutor.class));
+    }
+
+    @Test
+    public void shouldReportFailures() throws Exception {
+        // given
+        TestRunnerAdaptor adaptor = mock(TestRunnerAdaptor.class);
+        executeAllLifeCycles(adaptor);
+
+        // when
+        TestExecutionSummary result = run(adaptor, ClassWithArquillianExtensionAndParameterizedTest.class);
+
+        // then
+        Assertions.assertEquals(2, result.getTestsSucceededCount());
+        Assertions.assertEquals(2, result.getTestsFailedCount());
+        Assertions.assertEquals(0, result.getTestsSkippedCount());
+        assertCycle(0, Cycle.BEFORE_RULE, Cycle.AFTER_RULE, Cycle.BEFORE_CLASS_RULE, Cycle.AFTER_CLASS_RULE);
+        assertCycle(1, Cycle.BEFORE_CLASS, Cycle.AFTER_CLASS);
+        assertCycle(4, Cycle.BEFORE, Cycle.TEST, Cycle.AFTER);
+    }
+
+    public static class TestExecuteLifecycle extends ExecuteLifecycle {
+
+        @Override
+        public Object answer(InvocationOnMock invocation) {
+            try {
+                super.answer(invocation);
+            } catch (Throwable t) {
+                return TestResult.failed(t);
+            }
+            return TestResult.passed();
+        }
+    }
+}
diff --git a/junit5/core/src/main/java/org/jboss/arquillian/junit5/ArquillianExtension.java b/junit5/core/src/main/java/org/jboss/arquillian/junit5/ArquillianExtension.java
index ba3f9dca8..bf6240991 100644
--- a/junit5/core/src/main/java/org/jboss/arquillian/junit5/ArquillianExtension.java
+++ b/junit5/core/src/main/java/org/jboss/arquillian/junit5/ArquillianExtension.java
@@ -66,19 +66,18 @@ public void interceptTestTemplateMethod(Invocation<Void> invocation, ReflectiveI
             // run inside arquillian
             invocation.proceed();
         } else {
+            ContextStore contextStore = getContextStore(extensionContext);
             if (isRunAsClient(extensionContext)) {
                 // Run as client
                 interceptInvocation(invocationContext, extensionContext);
             } else {
-                ContextStore contextStore = getContextStore(extensionContext);
                 // Run as container (but only once)
                 if (!contextStore.isRegisteredTemplate(invocationContext.getExecutable())) {
                     interceptInvocation(invocationContext, extensionContext);
                 }
-                // Otherwise get result
-                contextStore.getResult(extensionContext.getUniqueId())
-                    .ifPresent(ExceptionUtils::throwAsUncheckedException);
             }
+            contextStore.getResult(extensionContext.getUniqueId())
+                .ifPresent(ExceptionUtils::throwAsUncheckedException);
         }
     }