diff --git a/src/main/java/org/jboss/arquillian/testcontainers/TestContainersObserver.java b/src/main/java/org/jboss/arquillian/testcontainers/TestContainersObserver.java
index dcc2517..330540b 100644
--- a/src/main/java/org/jboss/arquillian/testcontainers/TestContainersObserver.java
+++ b/src/main/java/org/jboss/arquillian/testcontainers/TestContainersObserver.java
@@ -42,7 +42,14 @@ public void createContainer(@Observes(precedence = 500) BeforeClass beforeClass)
         final DockerRequired dockerRequired = javaClass.getAnnotation(DockerRequired.class);
         if (dockerRequired != null) {
             if (!isDockerAvailable()) {
-                throw createException(dockerRequired.value());
+                // TODO Discuss non-WildFly options
+                if ("true".equals(System.getProperty("org.wildfly.test.require.docker")) ||
+                        "true".equals(System.getProperty("arquillian.testcontainers.require.docker"))) {
+                    throw new RuntimeException("Docker is required but it is not available or is not properly configured");
+                } else {
+                    throw createException(dockerRequired.value());
+                }
+
             }
         }
         final TestcontainerRegistry instances = new TestcontainerRegistry();