diff --git a/php5.6/tests/goss.yaml b/php5.6/tests/goss.yaml
index 00937fa..715293d 100644
--- a/php5.6/tests/goss.yaml
+++ b/php5.6/tests/goss.yaml
@@ -1,3 +1,5 @@
+---
+
 file:
   /usr/local/src/xhgui/config/config.php:
     exists: true
diff --git a/php5.6/tests/goss_wait.yaml b/php5.6/tests/goss_wait.yaml
index 967a27f..ddaaf44 100644
--- a/php5.6/tests/goss_wait.yaml
+++ b/php5.6/tests/goss_wait.yaml
@@ -1,3 +1,5 @@
+---
+
 port:
   tcp:27017:
     listening: true
diff --git a/php7.2/tests/goss.yaml b/php7.2/tests/goss.yaml
index e891b15..e00a8e1 100644
--- a/php7.2/tests/goss.yaml
+++ b/php7.2/tests/goss.yaml
@@ -1,9 +1,11 @@
+---
+
 package:
-  mongodb-server-core:
+  mongodb-org-server:
     installed: true
     versions:
       contain-element:
-        match-regexp: "1:3.6.+ubuntu[.0-9]+"
+        match-regexp: "4.4[.0-9]+"
   php7.2-fpm:
     installed: true
     versions:
diff --git a/php7.2/tests/goss_wait.yaml b/php7.2/tests/goss_wait.yaml
index ac79403..ed5b06b 100644
--- a/php7.2/tests/goss_wait.yaml
+++ b/php7.2/tests/goss_wait.yaml
@@ -1,3 +1,5 @@
+---
+
 port:
   tcp:27017:
     listening: true
diff --git a/php7.4/tests/goss.yaml b/php7.4/tests/goss.yaml
index 122eafc..faf4e1f 100644
--- a/php7.4/tests/goss.yaml
+++ b/php7.4/tests/goss.yaml
@@ -1,17 +1,11 @@
-file:
-  /usr/local/src/xhgui/config/config.php:
-    exists: true
-    owner: www-data
-    group: www-data
-    filetype: file
-    contains:
-    - mongodb://127.0.0.1
+---
+
 package:
-  mongodb-server-core:
+  mongodb-org-server:
     installed: true
     versions:
       contain-element:
-        match-regexp: "1:3.6.+ubuntu[.0-9]+"
+        match-regexp: "4.4[.0-9]+"
   php7.4-fpm:
     installed: true
     versions:
diff --git a/php7.4/tests/goss_wait.yaml b/php7.4/tests/goss_wait.yaml
index ac79403..ed5b06b 100644
--- a/php7.4/tests/goss_wait.yaml
+++ b/php7.4/tests/goss_wait.yaml
@@ -1,3 +1,5 @@
+---
+
 port:
   tcp:27017:
     listening: true