diff --git a/djangocms_blog/cms_app.py b/djangocms_blog/cms_app.py
deleted file mode 100644
index 8c0899b..0000000
--- a/djangocms_blog/cms_app.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
-
-from .cms_apps import *  # NOQA
diff --git a/djangocms_blog/cms_toolbar.py b/djangocms_blog/cms_toolbar.py
deleted file mode 100644
index 733681b..0000000
--- a/djangocms_blog/cms_toolbar.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
-
-from .cms_toolbars import *  # NOQA
diff --git a/tests/test_menu.py b/tests/test_menu.py
index 352922e..4eaf053 100644
--- a/tests/test_menu.py
+++ b/tests/test_menu.py
@@ -135,7 +135,7 @@ class MenuTest(BaseTest):
         self.app_config_1.save()
         self.app_config_2.app_data.config.menu_empty_categories = False
         self.app_config_2.save()
-        cache.clear()
+        self._reset_menus()
         for lang in languages:
             request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
             with smart_override(lang):
@@ -149,7 +149,7 @@ class MenuTest(BaseTest):
         self.app_config_1.save()
         self.app_config_2.app_data.config.menu_empty_categories = True
         self.app_config_2.save()
-        cache.clear()
+        self._reset_menus()
 
     def test_modifier(self):
         """
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index 7ef7202..8d91a74 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -41,10 +41,10 @@ class PluginTest(BaseTest):
         plugin_nocache = add_plugin(
             ph, 'BlogLatestEntriesPlugin', language='en', app_config=self.app_config_1
         )
-        with self.assertNumQueries(53):
+        with self.assertNumQueries(39):
             plugin_nocache.render_plugin(context, ph)
 
-        with self.assertNumQueries(17):
+        with self.assertNumQueries(15):
             rendered = plugin.render_plugin(context, ph)
         try:
             self.assertTrue(rendered.find('cms_plugin-djangocms_blog-post-abstract-1') > -1)