diff --git a/tests/pylorax/test_server.py b/tests/pylorax/test_server.py
index 943dfab7..a3e87caa 100644
--- a/tests/pylorax/test_server.py
+++ b/tests/pylorax/test_server.py
@@ -717,4 +717,3 @@ class ServerTestCase(unittest.TestCase):
         data = json.loads(resp.data)
         self.assertNotEqual(data, None)
         self.assertEqual(data["finished"], [], "Failed to delete the failed build: %s" % data)
->>>>>>> Add tests for /compose API