diff --git a/.kitchen.yml b/.kitchen.yml
index 046eeee..bcc7f4c 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -56,6 +56,9 @@ suites:
       - freebsd-13
       - freebsd-12
       - openbsd7
+  - name: t-guard-metricsport-blackbox-exporter
+    provisioner:
+      playbook: "test/integration/default/guard-metricsport-blackbox.yml"
   - name: t-guard-alpha-metricsport-blackbox-exporter
     provisioner:
       playbook: "test/integration/default/guard-alpha-metricsport-blackbox.yml"
@@ -63,6 +66,13 @@ suites:
       - freebsd-13
       - freebsd-12
       - openbsd7
+  - name: t-guard-nightly-metricsport-blackbox-exporter
+    provisioner:
+      playbook: "test/integration/default/guard-nightly-metricsport-blackbox.yml"
+    excludes:
+      - freebsd-13
+      - freebsd-12
+      - openbsd7
   - name: t-guard-blackbox-exporter
     provisioner:
       playbook: "test/integration/default/guard-blackbox-exporter.yml"
diff --git a/test/integration/default/guard-metricsport-blackbox.yml b/test/integration/default/guard-metricsport-blackbox.yml
new file mode 100644
index 0000000..b790571
--- /dev/null
+++ b/test/integration/default/guard-metricsport-blackbox.yml
@@ -0,0 +1,12 @@
+---
+- hosts: all
+  vars_files:
+    - vars/dry-run-vars.yml
+  vars:
+    - tor_enableMetricsPort: True
+    - tor_gen_metricsport_htpasswd: True
+    - tor_metricsport_nginx_config_file: /tmp/web-reverse-proxy
+    - tor_gen_blackbox_scrape_config: True
+    - tor_prometheus_scrape_file: ~/.tor/tor-prometheus-scrape-config_metricsport_and_blackbox_exporter
+  roles:
+    - "{{ playbook_dir | regex_replace('test/integration/default$') }}"
diff --git a/test/integration/default/guard-nightly-metricsport-blackbox.yml b/test/integration/default/guard-nightly-metricsport-blackbox.yml
new file mode 100644
index 0000000..384f535
--- /dev/null
+++ b/test/integration/default/guard-nightly-metricsport-blackbox.yml
@@ -0,0 +1,13 @@
+---
+- hosts: all
+  vars_files:
+    - vars/dry-run-vars.yml
+  vars:
+    - tor_nightly_builds: True
+    - tor_enableMetricsPort: True
+    - tor_gen_metricsport_htpasswd: True
+    - tor_metricsport_nginx_config_file: /tmp/web-reverse-proxy
+    - tor_gen_blackbox_scrape_config: True
+    - tor_prometheus_scrape_file: ~/.tor/tor-prometheus-scrape-config_metricsport_and_blackbox_exporter
+  roles:
+    - "{{ playbook_dir | regex_replace('test/integration/default$') }}"