diff --git a/cli/config/compose/services/vsphere.yml b/cli/config/compose/services/vsphere.yml
new file mode 100644
index 0000000000..ca54aa9723
--- /dev/null
+++ b/cli/config/compose/services/vsphere.yml
@@ -0,0 +1,9 @@
+version: '3'
+services:
+  vsphere:
+    image: "nimmis/vcsim:${vsphereTag}"
+    container_name: vsphere
+    healthcheck:
+      test: ["CMD", "curl", "--write-out", "'HTTP %{http_code}'", "--silent", "--output", "/dev/null", "http://vsphere:443/"]
+      retries: 10
+      interval: 10s
\ No newline at end of file
diff --git a/metricbeat-tests/configurations/vsphere.yml b/metricbeat-tests/configurations/vsphere.yml
new file mode 100644
index 0000000000..b528b1b450
--- /dev/null
+++ b/metricbeat-tests/configurations/vsphere.yml
@@ -0,0 +1,18 @@
+metricbeat.config:
+  modules:
+    path: ${path.config}/modules.d/*.yml
+    # Reload module configs as they change:
+    reload.enabled: false
+
+metricbeat.modules:
+  - module: vsphere
+    metricsets:
+      - datastore
+      - host
+      - virtualmachine
+    enabled: true
+    period: 5s
+    hosts: ["https://vsphere:443/sdk"]
+    username: "user"
+    password: "pass"
+    insecure: true
diff --git a/metricbeat-tests/features/vsphere.feature b/metricbeat-tests/features/vsphere.feature
new file mode 100644
index 0000000000..cfe034901c
--- /dev/null
+++ b/metricbeat-tests/features/vsphere.feature
@@ -0,0 +1,11 @@
+@vsphere
+Feature: As a Metricbeat developer I want to check that the vSphere module works as expected
+
+Scenario Outline: Check module is sending metrics to Elasticsearch
+  Given vSphere "<vsphere_version>" is running for metricbeat "<metricbeat_version>"
+    And metricbeat "<metricbeat_version>" is installed and configured for vSphere module
+  Then there are no errors in the index
+Examples:
+| vsphere_version | metricbeat_version |
+| latest  | 7.3.0 |
+| latest  | 8.0.0-SNAPSHOT |