diff --git a/metricbeat/mb/testing/testdata.go b/metricbeat/mb/testing/testdata.go
index 39ff777beefd..ca1005e57c37 100644
--- a/metricbeat/mb/testing/testdata.go
+++ b/metricbeat/mb/testing/testdata.go
@@ -278,7 +278,11 @@ func runTest(t *testing.T, file string, module, metricSetName string, config Dat
 		for _, e := range expectedMap {
 			t.Error(e)
 		}
-		t.Fatal()
+	}
+
+	// If there was some error, fail before trying to write anything.
+	if t.Failed() {
+		t.FailNow()
 	}
 
 	if strings.HasSuffix(file, "docs."+config.Suffix) {
diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/testdata/config.yml b/metricbeat/module/kubernetes/state_deployment/_meta/testdata/config.yml
index ab6bf2416543..6fc3bdf4271c 100644
--- a/metricbeat/module/kubernetes/state_deployment/_meta/testdata/config.yml
+++ b/metricbeat/module/kubernetes/state_deployment/_meta/testdata/config.yml
@@ -1,3 +1,5 @@
 type: http
 url: "/metrics"
 suffix: plain
+module:
+  timeout: 30s