diff --git a/requirements.txt b/requirements.txt
index b9e1ac6..2ac4347 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,4 @@ prettytable
 pbr
 six
 requests
+mock
diff --git a/surveilclient/tests/v2_0/__init__.py b/surveilclient/tests/v2_0/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/surveilclient/tests/v2_0/actions/__init__.py b/surveilclient/tests/v2_0/actions/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/surveilclient/tests/v2_0/actions/test_downtime.py b/surveilclient/tests/v2_0/actions/test_downtime.py
new file mode 100644
index 0000000..cd7fa9c
--- /dev/null
+++ b/surveilclient/tests/v2_0/actions/test_downtime.py
@@ -0,0 +1,34 @@
+# Copyright 2015 - Savoir-Faire Linux inc.
+#
+# 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. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import httpretty
+
+from surveilclient.tests.v2_0 import clienttest
+
+
+class TestDowntime(clienttest.ClientTest):
+
+    @httpretty.activate
+    def test_create(self):
+        httpretty.register_uri(
+            httpretty.POST, "http://localhost:8080/v2/actions/downtime",
+            body='{"message": "Ack received!"}')
+
+        self.client.actions.downtime.create(
+            host_name="somehost"
+        )
+        self.assertEqual(
+            httpretty.last_request().body.decode(),
+            u'{"host_name": "somehost"}'
+        )
diff --git a/surveilclient/tests/v2_0/clienttest.py b/surveilclient/tests/v2_0/clienttest.py
new file mode 100644
index 0000000..c945af6
--- /dev/null
+++ b/surveilclient/tests/v2_0/clienttest.py
@@ -0,0 +1,32 @@
+# Copyright 2015 - Savoir-Faire Linux inc.
+#
+# 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. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import unittest
+
+import mock
+
+from surveilclient import client
+
+
+class ClientTest(unittest.TestCase):
+
+    def setUp(self):
+        self.client = client.Client('http://localhost:8080/v2',
+                                    auth_url='http://localhost:8080/v2/auth',
+                                    version='2_0')
+
+        #  Mock the _get_auth_token call
+        self.client.http_client._get_auth_token = mock.Mock(
+            return_value="IAMAFAKETOKEN"
+        )