diff --git a/.kitchen.yml b/.kitchen.yml
index 6be862a..56e2279 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -68,7 +68,11 @@ platforms:
   - name: ubuntu-14.04
     driver:
       image: diodonfrost/ubuntu-14.04-ansible
+      provision_command: apt-get install -y init
       platform: ubuntu
+      run_command: /sbin/init
+      provision_command:
+        - sed -i 's/UsePAM yes/UsePAM no/g' /etc/ssh/sshd_config
 
   # Debian
   - name: debian-9
diff --git a/tasks/packages/setup-Darwin.yml b/tasks/packages/setup-Darwin.yml
new file mode 100644
index 0000000..a2841be
--- /dev/null
+++ b/tasks/packages/setup-Darwin.yml
@@ -0,0 +1,8 @@
+---
+# Tasks file for install ntp daemon on MacOSX system
+
+- name: Service ntp on MacOSX
+  service:
+    name: "{{ ntp_service }}"
+    enabled: yes
+    state: started
diff --git a/tests/vagrant/vagrant_solaris_target.rb b/tests/vagrant/vagrant_solaris_target.rb
deleted file mode 100644
index 6f5b1ba..0000000
--- a/tests/vagrant/vagrant_solaris_target.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-Vagrant.configure(2) do |config|
-  config.vm.provision "shell", inline: <<-SHELL
-    pkg install -r gcc
-    wget https://www.python.org/ftp/python/3.7.1/Python-3.7.1.tgz
-    tar zxvf Python-3.7.1.tgz && cd Python-3.7.1
-    ./configure
-    make
-    make install
-  SHELL
-end
diff --git a/tests/vagrant/vagrant_windows_target.rb b/tests/vagrant/vagrant_windows_target.rb
deleted file mode 100644
index e5dec10..0000000
--- a/tests/vagrant/vagrant_windows_target.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-Vagrant.configure("2") do |c|
-  c.vm.provision :shell, path: "https://raw.githubusercontent.com/ansible/ansible/devel/examples/scripts/ConfigureRemotingForAnsible.ps1"
-  c.vm.provision :shell, path: "https://chocolatey.org/install.ps1"
-end
diff --git a/vars/Darwin.yml b/vars/Darwin.yml
new file mode 100644
index 0000000..ddb00f0
--- /dev/null
+++ b/vars/Darwin.yml
@@ -0,0 +1,7 @@
+ntp_package:
+ntp_service: ntp
+
+ntp_configfile: /private/etc/ntp.conf
+ntp_configfile_user: root
+ntp_configfile_group: root
+ntp_driftfile: /private/var/lib/ntp/drift