diff --git a/ce/01_running-processes.yaml.tt2 b/ce/01_running-processes.yaml.tt2
index f72cf30..daf0cf5 100644
--- a/ce/01_running-processes.yaml.tt2
+++ b/ce/01_running-processes.yaml.tt2
@@ -64,5 +64,10 @@ process:
     running: true
   sshd:
     running: true
+{{if eq .Env.DEBIAN_RELEASE "8"}}
   udevd:
     running: true
+{{else}}
+  systemd-udevd:
+    running: true
+{{end}}
diff --git a/pro/01_running-processes.yaml.tt2 b/pro/01_running-processes.yaml.tt2
index fb49106..88dc9f5 100644
--- a/pro/01_running-processes.yaml.tt2
+++ b/pro/01_running-processes.yaml.tt2
@@ -100,8 +100,13 @@ process:
   snmpd:
     running: true
 
+{{if eq .Env.DEBIAN_RELEASE "8"}}
   udevd:
     running: true
+{{else}}
+  systemd-udevd:
+    running: true
+{{end}}
 
   voisniff-ng:
     running: true
diff --git a/testrunner b/testrunner
index 5c7d707..0b19933 100755
--- a/testrunner
+++ b/testrunner
@@ -33,7 +33,7 @@ if ls /var/cores/core.perl-fcgi.sig11* >/dev/null 2>&1 ; then
   echo "========================== DONE =============================="
 fi
 
-goss="goss-0.2.4-linux-amd64"
+goss="goss-0.3.1-linux-amd64"
 
 if [ ! -x "/usr/sbin/${goss}" ] ; then
   echo "Downloading goss and installing as /usr/sbin/${goss}"
@@ -67,6 +67,7 @@ rm -rf "${REPORT_DIRECTORY}"
 mkdir -p "${REPORT_DIRECTORY}"
 TAP_RESULTS="${REPORT_DIRECTORY}/goss_${TYPE}_results.tap"
 
-goss -g "/etc/ngcp-tests/${TYPE}/goss.yaml" validate --format tap | tee "${TAP_RESULTS}"
+DEBIAN_RELEASE=$(sed -e 's/\([0-9]*\)\..*/\1/' /etc/debian_version)
+DEBIAN_RELEASE=$DEBIAN_RELEASE goss -g "/etc/ngcp-tests/${TYPE}/goss.yaml" validate --format tap | tee "${TAP_RESULTS}"
 
 exit "${PIPESTATUS[0]}"