diff --git a/integration-tests/pkg/executor/executor_docker_api.go b/integration-tests/pkg/executor/executor_docker_api.go
index 0413c1676c..d713a7c440 100644
--- a/integration-tests/pkg/executor/executor_docker_api.go
+++ b/integration-tests/pkg/executor/executor_docker_api.go
@@ -155,6 +155,15 @@ func (d *dockerAPIExecutor) StartContainer(startConfig config.ContainerStartConf
 	if err != nil {
 		return "", errors.Wrapf(err, "create %s", startConfig.Name)
 	}
+
+	waitResp, waitErr := d.client.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
+	select {
+	case <-waitResp:
+		break
+	case err := <-waitErr:
+		return "", errors.Wrapf(err, "wait %s", startConfig.Name)
+	}
+
 	if err := d.client.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
 		return "", errors.Wrapf(err, "start %s", startConfig.Name)
 	}
diff --git a/integration-tests/suites/base.go b/integration-tests/suites/base.go
index 2de25cc73e..ff03a50dd6 100644
--- a/integration-tests/suites/base.go
+++ b/integration-tests/suites/base.go
@@ -254,7 +254,7 @@ func Mem2Numeric(value string) (float64, error) {
 		value, err := strconv.ParseFloat(numericPart, 32)
 		return value / 1024, err
 	} else {
-		return 0, errors.New(fmt.Sprintf("Invalid units, %s", value))
+		return 0, fmt.Errorf("Invalid units, %s", value)
 	}
 }