diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 0143715..4efe7e4 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -95,7 +95,7 @@
             self.start(rm = False, volumes = volumes, environment = env,
                        host_config = host_config, tty = True)
 
-    def execute_switch(self, cmd, shell = True):
+    def execute_switch(self, cmd, shell = False):
         if self.olt:
             return os.system(cmd)
         return self.execute(cmd, shell = shell)
@@ -197,7 +197,8 @@
                     cmds = ('brctl delif {} {}'.format(intf_host, local_if),
                             'ip link del {}'.format(local_if))
                 else:
-                    cmds = ('ovs-vsctl del-port {} {}'.format(intf_host, local_if),)
+                    cmds = ('ovs-vsctl del-port {} {}'.format(intf_host, local_if),
+                            'ip link del {}'.format(local_if))
 
             for cmd in cmds:
                 res += os.system(cmd)
diff --git a/src/test/setup/prerequisites.sh b/src/test/setup/prerequisites.sh
index 709fbff..21920c4 100755
--- a/src/test/setup/prerequisites.sh
+++ b/src/test/setup/prerequisites.sh
@@ -31,7 +31,7 @@
 pip install scapy==2.3.2
 pip install monotonic
 pip install configObj
-pip install -U docker-py
+pip install docker-py==1.9.0
 pip install -U pyyaml
 pip install -U nsenter
 pip install -U pyroute2
diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 95cc477..81addcb 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -180,7 +180,7 @@
                     ip.link('set', index=guest, state='up')
                 index += 1
 
-    def execute(self, cmd, tty = True, stream = False, shell = True):
+    def execute(self, cmd, tty = True, stream = False, shell = False):
         res = 0
         if type(cmd) == str:
             cmds = (cmd,)