diff --git a/tests/playbooks/roles b/tests/playbooks/roles
new file mode 120000
index 0000000..7b9ade8
--- /dev/null
+++ b/tests/playbooks/roles
@@ -0,0 +1 @@
+../roles/
\ No newline at end of file
diff --git a/tests/tests_unit.yml b/tests/tests_unit.yml
index f55164e..c6ea4ef 100644
--- a/tests/tests_unit.yml
+++ b/tests/tests_unit.yml
@@ -7,6 +7,7 @@
       command: yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm
       args:
         warn: false
+        creates: /etc/yum.repos.d/epel.repo
       when:
         - ansible_distribution in ['RedHat', 'CentOS']
         - ansible_distribution_major_version in ['6', '7']
@@ -34,7 +35,7 @@
         local_follow: false
       loop:
       - ../library/network_connections.py
-      - test_network_connections.py
+      - unit/test_network_connections.py
       - ../module_utils/network_lsr
 
     - name: Create helpers directory
@@ -48,12 +49,13 @@
         dest: /tmp/test-unit-1/helpers
         mode: 0755
       with_fileglob:
-        - helpers/*
+        - unit/helpers/*
 
     - name: Check if python2 is available
       command: python2 --version
       ignore_errors: true
       register: python2_available
+      when: true
 
     - name: Run python2 unit tests
       command: python2 /tmp/test-unit-1/test_network_connections.py --verbose
@@ -64,6 +66,7 @@
       command: python3 --version
       ignore_errors: true
       register: python3_available
+      when: true
 
     - name: Run python3 unit tests
       command: python3 /tmp/test-unit-1/test_network_connections.py --verbose
diff --git a/tests/helpers/ethtool b/tests/unit/helpers/ethtool
similarity index 100%
rename from tests/helpers/ethtool
rename to tests/unit/helpers/ethtool
diff --git a/tests/test_network_connections.py b/tests/unit/test_network_connections.py
similarity index 100%
rename from tests/test_network_connections.py
rename to tests/unit/test_network_connections.py
diff --git a/tox.ini b/tox.ini
index ce40a58..bc20613 100644
--- a/tox.ini
+++ b/tox.ini
@@ -116,7 +116,7 @@ commands =
         {posargs} \
         library/network_connections.py \
         module_utils/network_lsr \
-        tests/test_network_connections.py
+        tests/unit/test_network_connections.py
 
 [testenv:flake8]
 basepython = python2.7