diff --git a/wa/tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from wa/tests/__init__.py
rename to tests/__init__.py
diff --git a/wa/tests/data/extensions/devices/test_device.py b/tests/data/extensions/devices/test_device.py
similarity index 100%
rename from wa/tests/data/extensions/devices/test_device.py
rename to tests/data/extensions/devices/test_device.py
diff --git a/wa/tests/data/interrupts/after b/tests/data/interrupts/after
similarity index 100%
rename from wa/tests/data/interrupts/after
rename to tests/data/interrupts/after
diff --git a/wa/tests/data/interrupts/before b/tests/data/interrupts/before
similarity index 100%
rename from wa/tests/data/interrupts/before
rename to tests/data/interrupts/before
diff --git a/wa/tests/data/interrupts/result b/tests/data/interrupts/result
similarity index 100%
rename from wa/tests/data/interrupts/result
rename to tests/data/interrupts/result
diff --git a/wa/tests/data/logcat.2.log b/tests/data/logcat.2.log
similarity index 100%
rename from wa/tests/data/logcat.2.log
rename to tests/data/logcat.2.log
diff --git a/wa/tests/data/logcat.log b/tests/data/logcat.log
similarity index 100%
rename from wa/tests/data/logcat.log
rename to tests/data/logcat.log
diff --git a/wa/tests/data/test-agenda.yaml b/tests/data/test-agenda.yaml
similarity index 100%
rename from wa/tests/data/test-agenda.yaml
rename to tests/data/test-agenda.yaml
diff --git a/wa/tests/data/test-config.py b/tests/data/test-config.py
similarity index 100%
rename from wa/tests/data/test-config.py
rename to tests/data/test-config.py
diff --git a/wa/tests/test_agenda.py b/tests/test_agenda.py
similarity index 100%
rename from wa/tests/test_agenda.py
rename to tests/test_agenda.py
diff --git a/wa/tests/test_config.py b/tests/test_config.py
similarity index 100%
rename from wa/tests/test_config.py
rename to tests/test_config.py
diff --git a/wa/tests/test_diff.py b/tests/test_diff.py
similarity index 100%
rename from wa/tests/test_diff.py
rename to tests/test_diff.py
diff --git a/wa/tests/test_exec_control.py b/tests/test_exec_control.py
similarity index 100%
rename from wa/tests/test_exec_control.py
rename to tests/test_exec_control.py
diff --git a/wa/tests/test_plugin.py b/tests/test_plugin.py
similarity index 100%
rename from wa/tests/test_plugin.py
rename to tests/test_plugin.py
diff --git a/wa/tests/test_runtime_param_utils.py b/tests/test_runtime_param_utils.py
similarity index 100%
rename from wa/tests/test_runtime_param_utils.py
rename to tests/test_runtime_param_utils.py
diff --git a/wa/tests/test_signal.py b/tests/test_signal.py
similarity index 100%
rename from wa/tests/test_signal.py
rename to tests/test_signal.py
diff --git a/wa/tests/test_utils.py b/tests/test_utils.py
similarity index 100%
rename from wa/tests/test_utils.py
rename to tests/test_utils.py
diff --git a/wa/__init__.py b/wa/__init__.py
index fa30f856..d49e133a 100644
--- a/wa/__init__.py
+++ b/wa/__init__.py
@@ -1,4 +1,4 @@
-from wa.framework import pluginloader, log, signal
+from wa.framework import pluginloader, signal
 from wa.framework.command import Command, ComplexCommand, SubCommand
 from wa.framework.configuration import settings
 from wa.framework.configuration.core import Status
diff --git a/wa/tests/testutils.py b/wa/tests/testutils.py
deleted file mode 100644
index ed49a768..00000000
--- a/wa/tests/testutils.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from mock import Mock
-from nose.tools import assert_true
-
-from wa.framework import signal
-from wa.framework.plugin import Plugin
-from wa.utils.types import identifier
-
-
-class SignalWatcher(object):
-
-    signals = []
-
-    def __init__(self):
-        for sig in self.signals:
-            name = identifier(sig.name)
-            callback = Mock()
-            callback.im_func.__name__ = name
-            setattr(self, name, callback)
-            signal.connect(getattr(self, name), sig)
-
-    def assert_all_called(self):
-        for m in self.__dict__.itervalues():
-            assert_true(m.called)
-
-
-class MockContainerActor(Plugin):
-
-    name = 'mock-container'
-    kind = 'container-actor'
-
-    def __init__(self, owner=None, *args, **kwargs):
-        super(MockContainerActor, self).__init__(*args, **kwargs)
-        self.owner=owner
-        self.initialize = Mock()
-        self.finalize = Mock()
-        self.enter = Mock()
-        self.exit = Mock()
-        self.job_started = Mock()
-        self.job_completed = Mock()