diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 985239e33577331a57d2fb51a2d250af131a5c3f..53aeb7760d4fd3facc0386487c67b3801cb55e6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,21 @@ acceptance with puppet5 debian8:
   tags:
     - puppet-tests
 
+acceptance with puppet5 debian9:
+  stage: acceptance
+  variables:
+    BEAKER_PUPPET_COLLECTION: 'puppet5'
+    PUPPET_INSTALL_TYPE: 'agent'
+    BEAKER_IS_PE: 'no'
+    BEAKER_debug: 'true '
+    BEAKER_setfile: 'host.yml'
+    RBENV_VERSION: '2.5.1'
+  script:
+    - beaker-hostgenerator debian9-64{hypervisor=docker} > host.yml
+    - bundle exec rake beaker
+  tags:
+    - puppet-tests
+
 acceptance with puppet5 centos7:
   stage: acceptance
   variables:
@@ -108,6 +123,21 @@ acceptance with puppet6 debian8:
   tags:
     - puppet-tests
 
+acceptance with puppet6 debian9:
+  stage: acceptance
+  variables:
+    BEAKER_PUPPET_COLLECTION: 'puppet6'
+    PUPPET_INSTALL_TYPE: 'agent'
+    BEAKER_IS_PE: 'no'
+    BEAKER_debug: 'true '
+    BEAKER_setfile: 'host.yml'
+    RBENV_VERSION: '2.5.1'
+  script:
+    - beaker-hostgenerator debian9-64{hypervisor=docker} > host.yml
+    - bundle exec rake beaker
+  tags:
+    - puppet-tests
+
 acceptance with puppet6 centos7:
   stage: acceptance
   variables:
diff --git a/metadata.json b/metadata.json
index d6b917b23573553bb1c7a918177b4041c26b55ce..290df8f4fe37f98744035f92abc5b67dc7aa1122 100644
--- a/metadata.json
+++ b/metadata.json
@@ -21,7 +21,8 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8"
+        "8",
+	"9"
       ]
     },
     {
@@ -46,4 +47,4 @@
   "pdk-version": "1.8.0",
   "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git",
   "template-ref": "1.8.0-0-g0d9da00"
-}
\ No newline at end of file
+}