diff --git a/roles/maas-test-client-install/tasks/main.yml b/roles/maas-test-client-install/tasks/main.yml
index 8e90c9e..e7fbc6a 100644
--- a/roles/maas-test-client-install/tasks/main.yml
+++ b/roles/maas-test-client-install/tasks/main.yml
@@ -11,33 +11,16 @@
   delay: 60
   with_items:
    - lxc
+   - lxc-dev
+   - python-dev
 
-- name: set lxc bridge interface to be databr
+- name: Install PIP packages
+  pip:
+    name={{ item }}
   become: yes
-  lineinfile:
-    dest: /etc/lxc/default.conf
-    regexp: "^lxc.network.link ="
-    line: "lxc.network.link = databr"
-
-- name: Create testclient
-  become: yes
-  shell: lxc-ls | grep testclient || lxc-create -t ubuntu -n testclient
-  tags:
-    - skip_ansible_lint # FIXME: should used lxc_container module
-
-- name: Start testclient
-  become: yes
-  shell: lxc-info -n testclient -s | grep RUNNING || lxc-start -d -n testclient
-  tags:
-    - skip_ansible_lint # FIXME: should used lxc_container module
-
-- name: Set up networking inside the testclient for testing sample CORD subscriber
-  become: yes
-  shell: "{{ item }}"
+  register: result
+  until: result | success
+  retries: 15
+  delay: 60
   with_items:
-  - "lxc-attach -n testclient -- bash -c 'ip link show eth0.222 || ip link add link eth0 name eth0.222 type vlan id 222'"
-  - "lxc-attach -n testclient -- bash -c 'ip link show eth0.222.111 || ip link add link eth0.222 name eth0.222.111 type vlan id 111'"
-  - "lxc-attach -n testclient -- ifconfig eth0.222 up"
-  - "lxc-attach -n testclient -- ifconfig eth0.222.111 up"
-  tags:
-    - skip_ansible_lint # non-trivial use case
+   - lxc-python2