diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index b03c552427f..bce13272afe 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -530,11 +530,15 @@ class VirtualMachine:
         cmd.id = volume.id
         return apiclient.detachVolume(cmd)
 
-    def add_nic(self, apiclient, networkId):
+    def add_nic(self, apiclient, networkId, ipaddress=None):
         """Add a NIC to a VM"""
         cmd = addNicToVirtualMachine.addNicToVirtualMachineCmd()
         cmd.virtualmachineid = self.id
         cmd.networkid = networkId
+
+        if ipaddress:
+            cmd.ipaddress = ipaddress
+
         return apiclient.addNicToVirtualMachine(cmd)
 
     def remove_nic(self, apiclient, nicId):
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index eeed3bfa8fd..9ce3951fdeb 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -51,7 +51,8 @@ setup(name="Marvin",
         "mysql-connector-python",
         "requests",
         "paramiko",
-        "nose"
+        "nose",
+        "ddt >= 0.4.0"
     ],
     py_modules=['marvin.marvinPlugin'],
     zip_safe=False,