diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index cdd73ef..fb4c662 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -351,8 +351,9 @@
         openvswitch-common openvswitch-switch \
         python-twisted python-sqlite sqlite3 python-pexpect telnet arping isc-dhcp-server \
         python-paramiko python-maas-client python-keystoneclient python-neutronclient \
-        python-glanceclient python-novaclient
+        python-glanceclient python-novaclient python-dev libffi-dev libssl-dev
 RUN easy_install nose
+RUN python -m pip install --upgrade pip
 RUN mkdir -p /root/ovs
 WORKDIR /root
 RUN wget http://openvswitch.org/releases/openvswitch-{}.tar.gz -O /root/ovs/openvswitch-{}.tar.gz && \
@@ -361,6 +362,8 @@
  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-ssl && make && make install)
 RUN service openvswitch-switch restart || /bin/true
 RUN pip install scapy==2.3.2 scapy-ssl_tls==1.2.2 monotonic configObj docker-py pyyaml nsenter pyroute2 netaddr python-daemon
+RUN pip install -U cryptography
+RUN pip install -U paramiko
 RUN mv /usr/sbin/tcpdump /sbin/
 RUN ln -sf /sbin/tcpdump /usr/sbin/tcpdump
 RUN mv /usr/sbin/dhcpd /sbin/
diff --git a/src/test/setup/requirements.txt b/src/test/setup/requirements.txt
index 514cc17..df3a16b 100644
--- a/src/test/setup/requirements.txt
+++ b/src/test/setup/requirements.txt
@@ -16,6 +16,6 @@
 twisted
 pexpect
 apiclient
-python-libmaas
-maasclient
-maasutil
+#python-libmaas
+#maasclient
+#maasutil
diff --git a/src/test/utils/Fabric.py b/src/test/utils/Fabric.py
index 5bad546..1e61af1 100644
--- a/src/test/utils/Fabric.py
+++ b/src/test/utils/Fabric.py
@@ -1,12 +1,12 @@
-# 
+#
 # Copyright 2016-present Ciena Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,9 +19,9 @@
 import subprocess
 from apiclient.maas_client import MAASOAuth, MAASDispatcher, MAASClient
 from paramiko import SSHClient, WarningPolicy, AutoAddPolicy
-from CordTestServer import CORD_TEST_HOST
 
 class FabricMAAS(object):
+    CORD_TEST_HOST = '172.17.0.1'
     head_node = os.getenv('HEAD_NODE', CORD_TEST_HOST)
     maas_url = 'http://{}/MAAS/api/1.0/'.format(head_node)