diff --git a/.testr.conf b/.testr.conf
index dadb20b5f..0a0f2988c 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -6,12 +6,7 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
              OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} $JIT_FLAG -m subunit.run discover -s ./zaqar/tests/unit/transport $LISTOPT $IDOPTION
-             OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} $JIT_FLAG -m subunit.run discover -s ./zaqar/tests/unit/storage $LISTOPT $IDOPTION
-
+             ${PYTHON:-python} $JIT_FLAG -m subunit.run discover -s ./zaqar/tests/unit $LISTOPT $IDOPTION
 
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/tests/unit/common/storage/__init__.py b/tests/unit/common/storage/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/unit/__init__.py b/zaqar/tests/unit/common/__init__.py
similarity index 100%
rename from tests/unit/__init__.py
rename to zaqar/tests/unit/common/__init__.py
diff --git a/tests/unit/common/__init__.py b/zaqar/tests/unit/common/storage/__init__.py
similarity index 100%
rename from tests/unit/common/__init__.py
rename to zaqar/tests/unit/common/storage/__init__.py
diff --git a/tests/unit/common/storage/test_select.py b/zaqar/tests/unit/common/storage/test_select.py
similarity index 100%
rename from tests/unit/common/storage/test_select.py
rename to zaqar/tests/unit/common/storage/test_select.py
diff --git a/tests/unit/common/storage/test_utils.py b/zaqar/tests/unit/common/storage/test_utils.py
similarity index 100%
rename from tests/unit/common/storage/test_utils.py
rename to zaqar/tests/unit/common/storage/test_utils.py
diff --git a/tests/unit/common/test_api.py b/zaqar/tests/unit/common/test_api.py
similarity index 100%
rename from tests/unit/common/test_api.py
rename to zaqar/tests/unit/common/test_api.py
diff --git a/tests/unit/common/test_decorators.py b/zaqar/tests/unit/common/test_decorators.py
similarity index 100%
rename from tests/unit/common/test_decorators.py
rename to zaqar/tests/unit/common/test_decorators.py
diff --git a/tests/unit/common/test_pipeline.py b/zaqar/tests/unit/common/test_pipeline.py
similarity index 100%
rename from tests/unit/common/test_pipeline.py
rename to zaqar/tests/unit/common/test_pipeline.py
diff --git a/tests/unit/common/test_request.py b/zaqar/tests/unit/common/test_request.py
similarity index 100%
rename from tests/unit/common/test_request.py
rename to zaqar/tests/unit/common/test_request.py
diff --git a/zaqar/tests/unit/notification/test_notifier.py b/zaqar/tests/unit/notification/test_notifier.py
index 4ecd0759f..044cb003f 100644
--- a/zaqar/tests/unit/notification/test_notifier.py
+++ b/zaqar/tests/unit/notification/test_notifier.py
@@ -30,7 +30,7 @@ class NotifierTest(testing.TestBase):
                              {'subscriber': 'http://call.me'},
                              {'subscriber': 'http://ping.me'}
                              ]
-        self.cliend_id = uuid.uuid4()
+        self.client_id = uuid.uuid4()
         self.project = uuid.uuid4()
         self.messages = [{"ttl": 300,
                           "body": {"event": "BackupStarted",
@@ -43,27 +43,30 @@ class NotifierTest(testing.TestBase):
                          ]
 
         ctlr = mock.MagicMock()
-        ctlr.list = mock.Mock(return_value=iter(self.subscription))
+        ctlr.list = mock.Mock(return_value=iter([self.subscription]))
         self.driver = notifier.NotifierDriver(subscription_controller=ctlr)
 
     def test_post(self):
         with mock.patch('requests.post') as mock_post:
             self.driver.post('fake_queue', self.messages,
-                             self.client_uuid, self.project)
-            mock_post.assert_called_with(self.subscription[0]['subscriber'],
-                                         self.messages[0])
-            mock_post.assert_called_with(self.subscription[1]['subscriber'],
-                                         self.messages[0])
-            mock_post.assert_called_with(self.subscription[2]['subscriber'],
-                                         self.messages[0])
-            mock_post.assert_called_with(self.subscription[0]['subscriber'],
-                                         self.messages[1])
-            mock_post.assert_called_with(self.subscription[1]['subscriber'],
-                                         self.messages[1])
-            mock_post.assert_called_with(self.subscription[2]['subscriber'],
-                                         self.messages[1])
+                             self.client_id, self.project)
+            mock_post.assert_has_calls([
+                mock.call(self.subscription[0]['subscriber'],
+                          data=self.messages[0]),
+                mock.call(self.subscription[1]['subscriber'],
+                          data=self.messages[0]),
+                mock.call(self.subscription[2]['subscriber'],
+                          data=self.messages[0]),
+                mock.call(self.subscription[0]['subscriber'],
+                          data=self.messages[1]),
+                mock.call(self.subscription[1]['subscriber'],
+                          data=self.messages[1]),
+                mock.call(self.subscription[2]['subscriber'],
+                          data=self.messages[1]),
+                ], any_order=True)
+            self.assertEqual(6, len(mock_post.mock_calls))
 
-    def test_genrate_task(self):
-        subscriber = self.subscription_list[0]['subscriber']
+    def test_generate_task(self):
+        subscriber = self.subscription[0]['subscriber']
         new_task = self.driver._generate_task(subscriber, self.messages)
         self.assertIsInstance(new_task, task.webhook.WebhookTask)
diff --git a/tests/unit/test_bootstrap.py b/zaqar/tests/unit/test_bootstrap.py
similarity index 100%
rename from tests/unit/test_bootstrap.py
rename to zaqar/tests/unit/test_bootstrap.py