diff --git a/xmodule/editing_module.py b/xmodule/editing_module.py
index cd1ac32555..c37ceba907 100644
--- a/xmodule/editing_module.py
+++ b/xmodule/editing_module.py
@@ -5,7 +5,7 @@ import logging
 
 from xblock.fields import Scope, String
 
-from xmodule.mako_module import MakoModuleDescriptor, MakoTemplateBlockBase
+from xmodule.mako_module import MakoTemplateBlockBase
 
 log = logging.getLogger(__name__)
 
@@ -47,7 +47,10 @@ class EditingMixin(EditingFields, MakoTemplateBlockBase):
 
 class TabsEditingMixin(EditingFields, MakoTemplateBlockBase):
     """
-    Common code between TabsEditingDescriptor and XBlocks converted from XModules.
+    Module that provides a raw editing view of its data and children.  It does not
+    perform any validation on its definition---just passes it along to the browser.
+
+    This class is intended to be used as a mixin.
     """
 
     mako_template = "widgets/tabs-aggregator.html"
@@ -62,17 +65,3 @@ class TabsEditingMixin(EditingFields, MakoTemplateBlockBase):
             'data': self.data,
         })
         return _context
-
-
-class TabsEditingDescriptor(TabsEditingMixin, MakoModuleDescriptor):  # lint-amnesty, pylint: disable=abstract-method
-    """
-    Module that provides a raw editing view of its data and children.  It does not
-    perform any validation on its definition---just passes it along to the browser.
-
-    This class is intended to be used as a mixin.
-
-    Engine (module_edit.js) wants for metadata editor
-    template to be always loaded, so don't forget to include
-    settings tab in your module descriptor.
-    """
-    pass  # lint-amnesty, pylint: disable=unnecessary-pass
diff --git a/xmodule/tests/test_editing_module.py b/xmodule/tests/test_editing_module.py
deleted file mode 100644
index 603054844c..0000000000
--- a/xmodule/tests/test_editing_module.py
+++ /dev/null
@@ -1,54 +0,0 @@
-""" Tests for editing descriptors"""
-
-
-import logging
-import os
-import unittest
-from unittest.mock import Mock
-
-from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator
-from pkg_resources import resource_string
-from xblock.field_data import DictFieldData
-from xblock.fields import ScopeIds
-
-from xmodule.editing_module import TabsEditingDescriptor
-from xmodule.tests import get_test_descriptor_system
-
-log = logging.getLogger(__name__)
-
-
-class TabsEditingDescriptorTestCase(unittest.TestCase):
-    """ Testing TabsEditingDescriptor"""
-
-    def setUp(self):
-        super().setUp()
-        system = get_test_descriptor_system(render_template=Mock())
-        self.tabs = [
-            {
-                'name': "Test_css",
-                'template': "tabs/codemirror-edit.html",
-                'current': True,
-            },
-            {
-                'name': "Subtitles",
-                'template': "video/subtitles.html",
-            },
-            {
-                'name': "Settings",
-                'template': "tabs/video-metadata-edit-tab.html"
-            }
-        ]
-
-        TabsEditingDescriptor.tabs = self.tabs
-        self.descriptor = system.construct_xblock_from_class(
-            TabsEditingDescriptor,
-            scope_ids=ScopeIds(None, None, None,
-                               BlockUsageLocator(CourseLocator('org', 'course', 'run', branch='revision'),
-                                                 'category', 'name')),
-            field_data=DictFieldData({}),
-        )
-
-    def test_get_context(self):
-        """"test get_context"""
-        rendered_context = self.descriptor.get_context()
-        self.assertListEqual(rendered_context['tabs'], self.tabs)