diff --git a/.molecule/group_vars/all b/.molecule/group_vars/all
deleted file mode 100644
index b5dce2f7aeb7225bea7a972bcb406ba3cca1b26d..0000000000000000000000000000000000000000
--- a/.molecule/group_vars/all
+++ /dev/null
@@ -1,3 +0,0 @@
-five: 5
-six: 6
-eleven: '{{ five + six }}'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6274aa01b223aa43f1be946e2da2470f5d90e446..233bc80d8f4b0a2ed98f97e33a6269dd6ef0d882 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,12 +1,35 @@
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    sha: 6dfcb89af3c9b4d172cc2e5a8a2fa0f54615a338
+    sha: 7539d8bd1a00a3c1bfd34cdb606d3a6372e83469
     hooks:
     -   id: check-added-large-files
     -   id: check-json
     -   id: check-xml
     -   id: check-yaml
     -   id: check-merge-conflict
--   repo: https://www.shore.co.il/git/ansible-pre-commit/
-    sha: 94b506c144d4e22ebc1deef637a818db13bcaca5
+    -   id: flake8
+    -   id: check-symlinks
+-   repo: https://github.com/adarnimrod/ansible-pre-commit.git
+    sha: 0fadd691465b97db8992cfc66650f630e433324b
     hooks:
-    -   id: ansible-pre-commit
+    -   id: ansible-syntax-check
+        always_run: true
+        files: tests/playbook.yml
+        args:
+        - tests/playbook.yml
+-   repo: https://github.com/willthames/ansible-lint
+    sha: 959ab0f525e9abb19cf75f34381015cf33695f61
+    hooks:
+    -   id: ansible-lint
+        always_run: true
+        files: tests/playbook.yml
+        args:
+        - tests/playbook.yml
+-   repo: local
+    hooks:
+    -   id: piprot
+        name: piprot
+        description: Check up-to-date Python requirements
+        language: system
+        entry: piprot --quiet --outdated tests/requirements.txt
+        files: requirements.txt
+        always_run: true
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..abc583a44f62a169059b177cabed55bfe3ab9183
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,24 @@
+---
+language: python
+python: "2.7"
+dist: trusty
+sudo: false
+group: beta
+services: [docker]
+cache:
+  - pip
+  - directories:
+      - $HOME/.pre-commit
+
+install:
+  - pip install -r tests/requirements.txt | cat
+  - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
+  - molecule dependency
+
+script:
+  - pre-commit run --all-files
+  - molecule test --driver docker
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
+  email: false
diff --git a/README.rst b/README.rst
index ba87a76b29731d4f483332920ebe17ee27d38e4a..51a074ef5266dd5e7d803bfca963932ed29dee70 100644
--- a/README.rst
+++ b/README.rst
@@ -1,12 +1,15 @@
 Syslog forwarding
 #################
 
+.. image:: https://travis-ci.org/adarnimrod/syslog-forward.svg?branch=master
+    :target: https://travis-ci.org/adarnimrod/syslog-forward
+
 Configure syslog forwarding (syslogd on OpenBSD, rsyslog on Debian).
 
 Requirements
 ------------
 
-See :code:`meta/main.yml` and assertions at top of :code:`tasks/main.yml`.
+See :code:`meta/main.yml` and assertions at the top of :code:`tasks/main.yml`.
 
 Role Variables
 --------------
@@ -26,17 +29,22 @@ See :code:`tests/playbook.yml`.
 Testing
 -------
 
-To install the dependencies:
+Testing requires Python 2.7 and either Docker or Vagrant and Virtualbox.
+Install the Python dependencies, dependent roles and roles required for
+testing:
 
 .. code:: shell
 
-    ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD)
+    pip install -r tests/requirements.txt
+    ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
+    molecule dependency
 
 To run the full test suite:
 
 .. code:: shell
 
-    molecule test
+    pre-commit run --all-files
+    molecule test --platform all
 
 License
 -------
diff --git a/ansible.cfg b/ansible.cfg
index e9ff55d11e12f188e2f551060e6d149e870a10bd..905e3c64897217cd1b88acde10920ae04c7c6011 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,6 +1,11 @@
 [defaults]
+library = library
 host_key_checking = False
 retry_files_enabled = False
-roles_path = .molecule/roles:../
+roles_path = .molecule/roles:.molecule/../roles:../:../../
 command_warnings = True
 deprecation_warnings = True
+callback_whitelist = profile_tasks
+
+[ssh_connection]
+pipelining = True
diff --git a/defaults/main.yml b/defaults/main.yml
index 4dad2676948cb2e9e1d382246aca307f013cc8be..55eb10254e025524d8f0e1605db608f3c5896c94 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,4 @@
 ---
-# defaults file for ansible-role-syslog-forward
+# defaults file for syslog-forward
 
 syslog_server:
diff --git a/handlers/main.yml b/handlers/main.yml
index 73be0c79cbf72a09737d7c513434d044648c7778..5affd2e431bb405277a839b1c2a7bb8470c6a0c4 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-# handlers file for ansible-role-syslog-forward
+# handlers file for syslog-forward
 
 - name: Restart rsyslog
   service:
diff --git a/library/__init__.py b/library/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/meta/main.yml b/meta/main.yml
index 12adf7fa46311267012c28120526c33f37216d75..e66997bc351bb6d5564634e123e428d1c596eebe 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,6 +1,6 @@
 galaxy_info:
   author: Nimrod Adar
-  description: Configure syslog forwarding.
+  description: Configure syslog forwarding
   company: Shore technologies
   license: MIT
   min_ansible_version: 2.0
@@ -8,6 +8,7 @@ galaxy_info:
   - name: OpenBSD
     versions:
     - 5.9
+    - 6.0
   - name: Debian
     versions:
     - jessie
diff --git a/molecule.yml b/molecule.yml
index 5b65f4fc0b5b6761a77ffb3f4974b1f59e25bb02..208f5ac42b708f8b2c0ff38cb1dbe76645fc3ca9 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -1,12 +1,13 @@
 ---
 ansible:
-  verbose: v
+  verbose: vv
   playbook: tests/playbook.yml
   diff: True
+  config_file: ../ansible.cfg
 
-molecule:
-  testinfra_dir: tests
-  ansible_config_template: ansible.cfg
+dependency:
+  name: galaxy
+  requirements_file: tests/requirements.yml
 
 vagrant:
   providers:
@@ -14,12 +15,29 @@ vagrant:
     type: virtualbox
   platforms:
   - name: openbsd
-    box: kaorimatz/openbsd-5.9-amd64
-  - name: debian
+    box: kaorimatz/openbsd-6.0-amd64
+  - name: jessie
     box: debian/jessie64
   instances:
-  - name: ansible-role-syslog-forward
+  - name: syslog-forward
     options:
         append_platform_to_hostname: yes
   raw_config_args:
   - 'vm.synced_folder ".", "/vagrant", disabled: true'
+  - 'vbguest.auto_update = false'
+  - 'landrush.enabled = false'
+  - 'landrush_ip.override = false'
+
+docker:
+  containers:
+  - name: syslog-forward-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
diff --git a/tasks/main.yml b/tasks/main.yml
index 1076b8ba2247e0188977f1d5a00cd484930291d6..e41c9eaa35883325c1e21c37b5cc8ab21c6dc979 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,10 @@
 ---
-# tasks file for ansible-role-syslog-forward
+# tasks file for syslog-forward
 
-- name: Assert
+- name: Assertions
   assert:
-    that: ansible_os_family in [ 'Debian', 'OpenBSD' ]
+    that:
+        - ansible_os_family in ['OpenBSD', 'Debian']
 
 - name: APT install rsyslog
   when: ansible_os_family == 'Debian'
diff --git a/tests/playbook.yml b/tests/playbook.yml
index 29a1fe9f2c36834f0bd9bfeffe48e05ece654455..a740c9b6b40792e61997a4262c9d223c63019e06 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,9 +1,14 @@
 ---
-- hosts: ansible-role-syslog-forward-openbsd
+- hosts: syslog-forward-openbsd
   gather_facts: false
-  roles: [ role: ansible-role-openbsd-bootstrap ]
+  roles: [adarnimrod.openbsd-bootstrap]
+
+- hosts: syslog-forward-xenial
+  gather_facts: false
+  roles: [adarnimrod.debian-bootstrap]
 
 - hosts: all
-  vars:
+  strategy: free
+  roles:
+    - role: syslog-forward
       syslog_server: 169.254.254.254
-  roles: [ role: ansible-role-syslog-forward ]
diff --git a/tests/requirements.txt b/tests/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..70cb7661036d9bd7cc73bfb2f4f8978edce7ea4c
--- /dev/null
+++ b/tests/requirements.txt
@@ -0,0 +1,8 @@
+ansible==2.2.0.0
+testinfra==1.4.5
+molecule==1.16.1
+ansible-lint==3.4.8
+pre-commit==0.9.4
+piprot==0.9.7
+python-vagrant==0.5.14
+docker-py==1.10.6
diff --git a/tests/requirements.yml b/tests/requirements.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cdc294cd67e8c5b70eed5178580e6edde25e10bb
--- /dev/null
+++ b/tests/requirements.yml
@@ -0,0 +1,3 @@
+---
+- src: adarnimrod.openbsd-bootstrap
+- src: adarnimrod.debian-bootstrap
diff --git a/tests/test_example.py b/tests/test_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..aaea50030b9784f0528df9b936cf1903d3af5994
--- /dev/null
+++ b/tests/test_example.py
@@ -0,0 +1,12 @@
+from testinfra.utils.ansible_runner import AnsibleRunner
+
+testinfra_hosts = AnsibleRunner('.molecule/ansible_inventory').get_hosts('all')
+
+
+def test_example(Command):
+    assert Command('uname').rc == 0
+
+
+def test_root(Command, Sudo):
+    with Sudo():
+        assert Command('whoami').stdout.strip() == 'root'
diff --git a/tests/test_syslog_forward.py b/tests/test_syslog_forward.py
index 3338fdc687fa8b7bf43278d48d6aeb4022343755..706db0636592776332960b8687b656724a4c4c98 100644
--- a/tests/test_syslog_forward.py
+++ b/tests/test_syslog_forward.py
@@ -1,3 +1,8 @@
+from testinfra.utils.ansible_runner import AnsibleRunner
+
+testinfra_hosts = AnsibleRunner('.molecule/ansible_inventory').get_hosts('all')
+
+
 def test_syslog_forward(Service, SystemInfo):
     if SystemInfo.type == 'openbsd':
         assert Service('syslogd').is_running
diff --git a/vars/main.yml b/vars/main.yml
index 86e77590a203f10b5a66f50610b5944c267bcadf..b5e0d57eca8b93962a3d08b77ff9de664d8f65fc 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for ansible-role-syslog-forward
+# vars file for syslog-forward