diff --git a/dev-tools/mage/integtest.go b/dev-tools/mage/integtest.go
index f573d3df80ad..064dc7d8102b 100644
--- a/dev-tools/mage/integtest.go
+++ b/dev-tools/mage/integtest.go
@@ -185,37 +185,30 @@ func NewIntegrationRunners(path string, passInEnv map[string]string) (Integratio
 		if err != nil {
 			return nil, errors.Wrapf(err, "%s tester failed on Use", t.Name())
 		}
-		if use {
-			// Create the steps for the specific runner.
-			var runnerSteps IntegrationTestSteps
-			requirements := t.StepRequirements()
-			if requirements != nil {
-				runnerSteps = append(runnerSteps, requirements...)
-			}
-			runnerSteps = append(runnerSteps, steps...)
-
-			// Create the custom env for the runner.
-			env := map[string]string{}
-			for k, v := range passInEnv {
-				env[k] = v
-			}
-			env[insideIntegrationTestEnvVar] = "true"
-			passThroughEnvs(env, defaultPassthroughEnvVars...)
-			if mg.Verbose() {
-				env["MAGEFILE_VERBOSE"] = "1"
-			}
-			if UseVendor {
-				env["GOFLAGS"] = "-mod=vendor"
-			}
-
-			runner := &IntegrationRunner{
-				steps:  runnerSteps,
-				tester: t,
-				dir:    dir,
-				env:    env,
-			}
-			runners = append(runners, runner)
+		if !use {
+			continue
+		}
+		runner, err := initRunner(t, dir, passInEnv)
+		if err != nil {
+			return nil, errors.Wrapf(err, "initializing %s runner", t.Name())
+		}
+		runners = append(runners, runner)
+	}
+	// Keep support for modules that don't have a local environment defined at the module
+	// level (system, stack and cloud modules by now)
+	if len(runners) == 0 {
+		if mg.Verbose() {
+			fmt.Printf(">> No runner found in %s, using docker\n", path)
+		}
+		tester, ok := globalIntegrationTesters["docker"]
+		if !ok {
+			return nil, fmt.Errorf("docker integration test runner not registered")
+		}
+		runner, err := initRunner(tester, dir, passInEnv)
+		if err != nil {
+			return nil, errors.Wrapf(err, "initializing docker runner")
 		}
+		runners = append(runners, runner)
 	}
 	return runners, nil
 }
@@ -230,6 +223,10 @@ func NewDockerIntegrationRunner(passThroughEnvVars ...string) (*IntegrationRunne
 	if !ok {
 		return nil, fmt.Errorf("docker integration test runner not registered")
 	}
+	return initRunner(tester, cwd, nil, passThroughEnvVars...)
+}
+
+func initRunner(tester IntegrationTester, dir string, passInEnv map[string]string, passThroughEnvVars ...string) (*IntegrationRunner, error) {
 	var runnerSteps IntegrationTestSteps
 	requirements := tester.StepRequirements()
 	if requirements != nil {
@@ -240,8 +237,11 @@ func NewDockerIntegrationRunner(passThroughEnvVars ...string) (*IntegrationRunne
 	env := map[string]string{
 		insideIntegrationTestEnvVar: "true",
 	}
-	passThroughEnvs(env, defaultPassthroughEnvVars...)
+	for name, value := range passInEnv {
+		env[name] = value
+	}
 	passThroughEnvs(env, passThroughEnvVars...)
+	passThroughEnvs(env, defaultPassthroughEnvVars...)
 	if mg.Verbose() {
 		env["MAGEFILE_VERBOSE"] = "1"
 	}
@@ -252,7 +252,7 @@ func NewDockerIntegrationRunner(passThroughEnvVars ...string) (*IntegrationRunne
 	runner := &IntegrationRunner{
 		steps:  runnerSteps,
 		tester: tester,
-		dir:    cwd,
+		dir:    dir,
 		env:    env,
 	}
 	return runner, nil