diff --git a/test/ci-bootstrap.py b/test/ci-bootstrap.py
index c63b765c0ea03ddcf0b9ac5e4c6ac00bb28ce4ba..673dc5bdd1b4da072a6e3fcca1c30117827fcbbf 100755
--- a/test/ci-bootstrap.py
+++ b/test/ci-bootstrap.py
@@ -82,7 +82,7 @@ if __name__ == "__main__":
 
     # Get droplet ip
     droplet = cosmos.get_droplet(id)
-    ip = droplet['droplet']['networks']['v4'][0]['ip_address']
+    ip = droplet['networks']['v4'][0]['ip_address']
 
     # Wait for ssh
     cosmos.wait_for_ssh(ip)
diff --git a/test/cosmos.py b/test/cosmos.py
index 18ffdee7a5dffc46b4cad209b9ecb7c6cc19a19c..7fa670c34419049fa1a8be9291b382e631b41eaf 100755
--- a/test/cosmos.py
+++ b/test/cosmos.py
@@ -93,20 +93,20 @@ def get_droplets_by_name(name_regex: str):
     for droplet in all:
         if re.match(name_regex, droplet['name']):
             matching.append(droplet)
-    return matching
+    return matching['droplet']
 
 
 def get_droplet(id: int):
     """Get information about specified droplet."""
     response = request_api('droplets/{0}'.format(id))
-    return response
+    return response['droplet']
 
 
 def list_droplets(verbose: bool = False):
     """List all droplets by their ID, Name, IP and state."""
     droplets = get_droplets()
     if verbose:
-        print(json.dumps(droplets['droplets'], sort_keys=True, indent=2))
+        print(json.dumps(droplets, sort_keys=True, indent=2))
     for droplet in droplets:
         print(droplet['id'], ' ', droplet['name'], ' ',
               droplet['networks']['v4'][0]['ip_address'],
@@ -124,7 +124,7 @@ def shutdown_droplet(id: int):
 def status_droplet(id: int):
     """Get status of specified droplet."""
     response = get_droplet(id)
-    return response['droplet']['status']
+    return response['status']
 
 
 def terminate_droplet(id: int):