diff --git a/infrared/tasks/report.yml b/infrared/tasks/report.yml
deleted file mode 100644
index d9dc541a6..000000000
--- a/infrared/tasks/report.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-  - name: Create Tobiko report
-    shell: |
-        cd "{{ test.dir }}"
-        source "{{ test.venv }}/bin/activate"
-        tox -e report
-
-  - fetch:
-     src: "{{ test.dir }}/{{ item }}"
-     dest: "{{ inventory_dir }}/tobiko_results_{{ test.results_dir_suffix }}/"
-     flat: yes
-    loop:
-      - tobiko.conf
-      - tobiko.log
-      - tobiko_results.html
-      - tobiko_results.xml
\ No newline at end of file
diff --git a/infrared/tasks/run.yml b/infrared/tasks/run.yml
deleted file mode 100644
index af872cb63..000000000
--- a/infrared/tasks/run.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- name: Run Tobiko Tests
-  shell: |
-      cd "{{ test.dir }}"
-      source "{{ test.overcloudrc }}"
-      source "{{ test.venv }}/bin/activate"
-      tox -e {{ test.tests }}
diff --git a/plugin.spec b/plugin.spec
index 3dec7a095..85cfc8d9e 100644
--- a/plugin.spec
+++ b/plugin.spec
@@ -1,7 +1,7 @@
 ---
 config:
     plugin_type: test
-    entry_point: ./infrared/main.yml
+    entry_point: ./roles/infrared/main.yml
 
 subparsers:
     tobiko:
@@ -26,11 +26,6 @@ subparsers:
                       default: "{{ ansible_env.HOME }}/overcloudrc"
                       help: |
                           The path to the overcloudrc file
-                  venv:
-                      type: Value
-                      default: "{{ ansible_env.HOME }}/tobiko_venv"
-                      help: |
-                          path of existing virtual environment
                   floating_network:
                       type: Value
                       default: "public"
@@ -40,7 +35,7 @@ subparsers:
                       type: Value
                       help: |
                           The set of tests to execute
-                      default: neutron
+                      default: scenario
                   results_dir_suffix:
                       type: Value
                       help: |
diff --git a/infrared/README.md b/roles/infrared/README.md
similarity index 100%
rename from infrared/README.md
rename to roles/infrared/README.md
diff --git a/infrared/main.yml b/roles/infrared/main.yml
similarity index 100%
rename from infrared/main.yml
rename to roles/infrared/main.yml
diff --git a/infrared/tasks/configure.yml b/roles/infrared/tasks/configure.yml
similarity index 100%
rename from infrared/tasks/configure.yml
rename to roles/infrared/tasks/configure.yml
diff --git a/infrared/tasks/install.yml b/roles/infrared/tasks/install.yml
similarity index 58%
rename from infrared/tasks/install.yml
rename to roles/infrared/tasks/install.yml
index 5b1414d75..300ef36ca 100644
--- a/infrared/tasks/install.yml
+++ b/roles/infrared/tasks/install.yml
@@ -41,29 +41,3 @@
 
 - debug: var=git_log.stdout_lines
   when: test.refsec != ''
-
-- name: Create Virtualenv if python >= 3
-  vars:
-      packages: ['pip', 'setuptools', 'tox']
-  pip:
-      virtualenv: "{{ test.venv }}"
-      name: "{{ packages }}"
-      state: latest
-  when: ansible_python.version.major >=3
-
-- name: Create Virtualenv if python <= 2
-  vars:
-      packages: ['pip', 'setuptools', 'tox<=2.5.0']
-  pip:
-      virtualenv: "{{ test.venv }}"
-      name: "{{ packages }}"
-      state: present
-  when: ansible_python.version.major <=2
-
-- name: Install Tobiko
-  pip:
-      chdir: "{{ test.dir }}"
-      name: "."
-      virtualenv: "{{ test.venv }}"
-      editable: true
-      extra_args: "-c https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt -r {{ test.dir }}/requirements.txt"
diff --git a/roles/infrared/tasks/report.yml b/roles/infrared/tasks/report.yml
new file mode 100644
index 000000000..a1f47b061
--- /dev/null
+++ b/roles/infrared/tasks/report.yml
@@ -0,0 +1,19 @@
+---
+
+- name: Create Tobiko report
+  shell:
+    chdir: "{{ test.dir }}"
+    cmd: |
+      source "{{ test.overcloudrc }}"
+      tools/ci/tox -e report
+
+
+- fetch:
+   src: "{{ test.dir }}/{{ item }}"
+   dest: "{{ inventory_dir }}/tobiko_results_{{ test.results_dir_suffix }}/"
+   flat: yes
+  loop:
+    - tobiko.conf
+    - tobiko.log
+    - tobiko_results.html
+    - tobiko_results.xml
diff --git a/roles/infrared/tasks/run.yml b/roles/infrared/tasks/run.yml
new file mode 100644
index 000000000..ac3a9e4cc
--- /dev/null
+++ b/roles/infrared/tasks/run.yml
@@ -0,0 +1,8 @@
+---
+
+- name: Run Tobiko Tests
+  shell:
+    chdir: "{{ test.dir }}"
+    cmd: |
+      source "{{ test.overcloudrc }}"
+      tools/ci/tox -e "{{ test.tests }}"
diff --git a/infrared/tasks/templates/os-faults.yaml.j2 b/roles/infrared/tasks/templates/os-faults.yaml.j2
similarity index 100%
rename from infrared/tasks/templates/os-faults.yaml.j2
rename to roles/infrared/tasks/templates/os-faults.yaml.j2
diff --git a/infrared/tasks/templates/tobiko.conf.j2 b/roles/infrared/tasks/templates/tobiko.conf.j2
similarity index 87%
rename from infrared/tasks/templates/tobiko.conf.j2
rename to roles/infrared/tasks/templates/tobiko.conf.j2
index fcb32572a..8fae8b1c1 100644
--- a/infrared/tasks/templates/tobiko.conf.j2
+++ b/roles/infrared/tasks/templates/tobiko.conf.j2
@@ -15,4 +15,4 @@ undercloud_ssh_password = stack
 undercloud_ssh_username = stack
 
 [tripleo]
-undercloud_ssh_hostname = undercloud-0
\ No newline at end of file
+undercloud_ssh_hostname = undercloud-0