diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/DockerAvailableDetector.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/DockerAvailableDetector.groovy
index b64299ffa87..9ca3c34408e 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/DockerAvailableDetector.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/DockerAvailableDetector.groovy
@@ -1,7 +1,9 @@
 package org.testcontainers.spock
 
+import groovy.transform.CompileStatic
 import org.testcontainers.DockerClientFactory
 
+@CompileStatic
 class DockerAvailableDetector {
 
 	boolean isDockerAvailable() {
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
index 6c71ac421c6..a7986fcd908 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
@@ -1,5 +1,6 @@
 package org.testcontainers.spock
 
+import groovy.transform.CompileStatic
 import groovy.transform.PackageScope
 import org.spockframework.runtime.extension.IMethodInvocation
 import org.testcontainers.lifecycle.TestDescription
@@ -10,6 +11,7 @@ import org.testcontainers.lifecycle.TestDescription
  * Filesystem friendly name is based on Specification and Feature.
  */
 @PackageScope
+@CompileStatic
 class SpockTestDescription implements TestDescription {
 
 	String specName
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
index 2654408e901..0259be801ea 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
@@ -1,10 +1,12 @@
 package org.testcontainers.spock
 
+import groovy.transform.CompileStatic
 import org.spockframework.runtime.AbstractRunListener
 import org.spockframework.runtime.extension.AbstractAnnotationDrivenExtension
 import org.spockframework.runtime.model.ErrorInfo
 import org.spockframework.runtime.model.SpecInfo
 
+@CompileStatic
 class TestcontainersExtension extends AbstractAnnotationDrivenExtension<Testcontainers> {
 
 	private final DockerAvailableDetector dockerDetector
@@ -34,7 +36,7 @@ class TestcontainersExtension extends AbstractAnnotationDrivenExtension<Testcont
 		spec.addListener(listener)
 	}
 
-	private class ErrorListener extends AbstractRunListener {
+	class ErrorListener extends AbstractRunListener {
 		List<ErrorInfo> errors = []
 
 		@Override
diff --git a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
index cbef0a87bb2..dde9deb4b29 100644
--- a/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
+++ b/modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
@@ -1,5 +1,6 @@
 package org.testcontainers.spock
 
+import groovy.transform.CompileStatic
 import org.spockframework.runtime.extension.AbstractMethodInterceptor
 import org.spockframework.runtime.extension.IMethodInvocation
 import org.spockframework.runtime.model.FieldInfo
@@ -10,6 +11,7 @@ import org.testcontainers.containers.GenericContainer
 import org.testcontainers.lifecycle.TestLifecycleAware
 import org.testcontainers.spock.TestcontainersExtension.ErrorListener
 
+@CompileStatic
 class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {
 
 	private final SpecInfo spec