diff --git a/Tribler/Test/Core/CreditMining/test_creditmining_sys.py b/Tribler/Test/Core/CreditMining/test_creditmining_sys.py
index 21f6fdade07..1fc01b68b61 100644
--- a/Tribler/Test/Core/CreditMining/test_creditmining_sys.py
+++ b/Tribler/Test/Core/CreditMining/test_creditmining_sys.py
@@ -17,19 +17,17 @@
 from Tribler.Core.DownloadConfig import DefaultDownloadStartupConfig
 from Tribler.Core.TorrentDef import TorrentDef
 from Tribler.Core.Utilities.twisted_thread import deferred, reactor
-from Tribler.Core.simpledefs import NTFY_TORRENTS, NTFY_UPDATE, NTFY_CHANNELCAST
+from Tribler.Core.simpledefs import NTFY_TORRENTS, NTFY_UPDATE
 from Tribler.Main.Utility.GuiDBTuples import CollectedTorrent
 from Tribler.Policies.BoostingManager import BoostingManager, BoostingSettings
 from Tribler.Test.Core.CreditMining.mock_creditmining import MockLtTorrent, ResourceFailClass
-from Tribler.Test.Core.Modules.Channel.base_test_channel import BaseTestChannel
-from Tribler.Test.test_as_server import TestAsServer
+from Tribler.Test.Core.base_test_channel import BaseTestChannel
 from Tribler.Test.common import TORRENT_UBUNTU_FILE, TORRENT_UBUNTU_FILE_INFOHASH, TESTS_DATA_DIR
+from Tribler.Test.test_as_server import TestAsServer
 from Tribler.Test.util import prepare_xml_rss
-from Tribler.community.allchannel.community import AllChannelCommunity
 from Tribler.community.channel.community import ChannelCommunity
 from Tribler.dispersy.dispersy import Dispersy
 from Tribler.dispersy.endpoint import ManualEnpoint
-from Tribler.dispersy.member import DummyMember
 from Tribler.dispersy.util import blocking_call_on_reactor_thread
 
 
diff --git a/Tribler/Test/Core/Modules/Channel/test_channel.py b/Tribler/Test/Core/Modules/Channel/test_channel.py
index 93eb3888d9c..caaa3bf1858 100644
--- a/Tribler/Test/Core/Modules/Channel/test_channel.py
+++ b/Tribler/Test/Core/Modules/Channel/test_channel.py
@@ -1,6 +1,6 @@
 from Tribler.Core.Modules.channel.channel import ChannelObject
 from Tribler.Core.Modules.channel.channel_rss import ChannelRssParser
-from Tribler.Test.Core.Modules.Channel.base_test_channel import BaseTestChannel
+from Tribler.Test.Core.base_test_channel import BaseTestChannel
 
 
 class TestChannel(BaseTestChannel):
diff --git a/Tribler/Test/Core/Modules/Channel/test_channel_rss.py b/Tribler/Test/Core/Modules/Channel/test_channel_rss.py
index 2be25c6cc1a..74b31f44a03 100644
--- a/Tribler/Test/Core/Modules/Channel/test_channel_rss.py
+++ b/Tribler/Test/Core/Modules/Channel/test_channel_rss.py
@@ -5,8 +5,9 @@
 from Tribler.Core.Modules.channel.cache import SimpleCache
 from Tribler.Core.Modules.channel.channel_rss import ChannelRssParser, RSSFeedParser
 from Tribler.Core.Utilities.twisted_thread import deferred
-from Tribler.Test.Core.Modules.Channel.base_test_channel import BaseTestChannel
+
 from Tribler.Test.Core.base_test import TriblerCoreTest
+from Tribler.Test.Core.base_test_channel import BaseTestChannel
 from Tribler.Test.common import TESTS_DATA_DIR
 
 
diff --git a/Tribler/Test/Core/Modules/RestApi/base_api_test.py b/Tribler/Test/Core/Modules/RestApi/base_api_test.py
index 3500c350e81..8e025d91888 100644
--- a/Tribler/Test/Core/Modules/RestApi/base_api_test.py
+++ b/Tribler/Test/Core/Modules/RestApi/base_api_test.py
@@ -13,8 +13,7 @@
 from Tribler.Core.Utilities.network_utils import get_random_port
 from Tribler.Core.Utilities.twisted_thread import reactor
 from Tribler.Core.version import version_id
-from Tribler.Test.Core.Modules.Channel.base_test_channel import BaseTestChannel
-from Tribler.Test.test_as_server import TestAsServer
+from Tribler.Test.Core.base_test_channel import BaseTestChannel
 from Tribler.dispersy.util import blocking_call_on_reactor_thread
 
 
diff --git a/Tribler/Test/Core/Modules/Channel/base_test_channel.py b/Tribler/Test/Core/base_test_channel.py
similarity index 100%
rename from Tribler/Test/Core/Modules/Channel/base_test_channel.py
rename to Tribler/Test/Core/base_test_channel.py