diff --git a/molecule.yml b/molecule.yml
index 3911692b7522854ca50c768b20960f80abad8f42..a71ec14f2e562345fa7c9055cbd79ce51a26aff4 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -32,17 +32,6 @@ vagrant:
 
 docker:
   containers:
-  - name: ntp-client-jessie
-    image: debian
-    image_version: jessie
-    command: /sbin/init
-    privileged: True
-    volume_mounts:
-      - /sys/fs/cgroup:/sys/fs/cgroup
-      - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
-    environment:
-        DEBIAN_FRONTEND: noninteractive
-        container: docker
   - name: ntp-client-trusty
     image: ubuntu-upstart
     image_version: trusty
diff --git a/tasks/main.yml b/tasks/main.yml
index 30acc1b7ddaf42e1666131d8f8aa5d31f0836989..2b8d2e03bb9189913ed1e440624302a53ff64a59 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,7 +3,10 @@
 
 - name: Assertions
   assert:
-    that: ansible_os_family in [ 'Debian', 'OpenBSD' ]
+    that:
+        - ansible_os_family in ntpd_conf
+        - ansible_os_family in ntp_pool
+        - ansible_os_family in ntpd_service
 
 - name: apt install
   when: ansible_pkg_mgr == 'apt' and not ansible_service_mgr == 'systemd'