diff --git a/tests/integration/test_base.py b/tests/integration/test_base.py
index 33cc3cf6f..65b440b93 100644
--- a/tests/integration/test_base.py
+++ b/tests/integration/test_base.py
@@ -209,18 +209,6 @@ def _get_scenario_xml(self):  # pylint: disable=no-self-use
         return "<vertical_demo><drag-and-drop-v2/></vertical_demo>"
 
 
-class DefaultAssessmentDataTestMixin(DefaultDataTestMixin):
-    """
-    Provides a test scenario with default options in assessment mode.
-    """
-    MAX_ATTEMPTS = 5
-
-    def _get_scenario_xml(self):  # pylint: disable=no-self-use
-        return """
-            <vertical_demo><drag-and-drop-v2 mode='assessment' max_attempts='{max_attempts}'/></vertical_demo>
-        """.format(max_attempts=self.MAX_ATTEMPTS)
-
-
 class InteractionTestBase(object):
     @classmethod
     def _get_items_with_zone(cls, items_map):
diff --git a/tests/integration/test_interaction.py b/tests/integration/test_interaction.py
index 9b2189073..4e5f2a9f8 100644
--- a/tests/integration/test_interaction.py
+++ b/tests/integration/test_interaction.py
@@ -11,12 +11,8 @@
 from selenium.webdriver.support.ui import WebDriverWait
 from xblockutils.resources import ResourceLoader
 
-from drag_and_drop_v2.default_data import (
-    TOP_ZONE_ID, MIDDLE_ZONE_ID, BOTTOM_ZONE_ID, TOP_ZONE_TITLE, START_FEEDBACK, FINISH_FEEDBACK
-)
-from drag_and_drop_v2.utils import FeedbackMessages
 from tests.integration.test_base import (
-    DefaultDataTestMixin, DefaultAssessmentDataTestMixin, InteractionTestBase, ItemDefinition
+    DefaultDataTestMixin, InteractionTestBase, ItemDefinition
 )
 from .test_base import BaseIntegrationTest
 
@@ -207,24 +203,6 @@ def interact_with_keyboard_help(self, scroll_down=250, use_keyboard=False):
             self.assertFalse(dialog_modal.is_displayed())
 
 
-class AssessmentTestMixin(object):
-    """
-    Provides helper methods for assessment tests
-    """
-    @staticmethod
-    def _wait_until_enabled(element):
-        wait = WebDriverWait(element, 2)
-        wait.until(lambda e: e.is_displayed() and e.get_attribute('disabled') is None)
-
-    def click_submit(self):
-        submit_button = self._get_submit_button()
-
-        self._wait_until_enabled(submit_button)
-
-        submit_button.click()
-        self.wait_for_ajax()
-
-
 @ddt
 class StandardInteractionTest(DefaultDataTestMixin, InteractionTestBase, ParameterizedTestsMixin, BaseIntegrationTest):
     """
@@ -294,152 +272,6 @@ def test_keyboard_help(self, use_keyboard):
         self.interact_with_keyboard_help(use_keyboard=use_keyboard)
 
 
-@ddt
-class AssessmentInteractionTest(
-    DefaultAssessmentDataTestMixin, AssessmentTestMixin, ParameterizedTestsMixin,
-    InteractionTestBase, BaseIntegrationTest
-):
-    """
-    Testing interactions with Drag and Drop XBlock against default data in assessment mode.
-    All interactions are tested using mouse (action_key=None) and four different keyboard action keys.
-    If default data changes this will break.
-    """
-    @data(None, Keys.RETURN, Keys.SPACE, Keys.CONTROL+'m', Keys.COMMAND+'m')
-    def test_item_no_feedback_on_good_move(self, action_key):
-        self.parameterized_item_positive_feedback_on_good_move(
-            self.items_map, action_key=action_key, assessment_mode=True
-        )
-
-    @data(None, Keys.RETURN, Keys.SPACE, Keys.CONTROL+'m', Keys.COMMAND+'m')
-    def test_item_no_feedback_on_bad_move(self, action_key):
-        self.parameterized_item_negative_feedback_on_bad_move(
-            self.items_map, self.all_zones, action_key=action_key, assessment_mode=True
-        )
-
-    @data(None, Keys.RETURN, Keys.SPACE, Keys.CONTROL+'m', Keys.COMMAND+'m')
-    def test_move_items_between_zones(self, action_key):
-        self.parameterized_move_items_between_zones(
-            self.items_map, self.all_zones, action_key=action_key
-        )
-
-    @data(None, Keys.RETURN, Keys.SPACE, Keys.CONTROL+'m', Keys.COMMAND+'m')
-    def test_final_feedback_and_reset(self, action_key):
-        self.parameterized_final_feedback_and_reset(
-            self.items_map, self.feedback, action_key=action_key, assessment_mode=True
-        )
-
-    @data(False, True)
-    def test_keyboard_help(self, use_keyboard):
-        self.interact_with_keyboard_help(use_keyboard=use_keyboard)
-
-    def test_submit_button_shown(self):
-        first_item_definition = self._get_items_with_zone(self.items_map).values()[0]
-
-        submit_button = self._get_submit_button()
-        self.assertTrue(submit_button.is_displayed())
-        self.assertEqual(submit_button.get_attribute('disabled'), 'true')  # no items are placed
-
-        attempts_info = self._get_attempts_info()
-        expected_text = "You have used {num} of {max} attempts.".format(num=0, max=self.MAX_ATTEMPTS)
-        self.assertEqual(attempts_info.text, expected_text)
-        self.assertEqual(attempts_info.is_displayed(), self.MAX_ATTEMPTS > 0)
-
-        self.place_item(first_item_definition.item_id, first_item_definition.zone_ids[0], None)
-
-        self.assertEqual(submit_button.get_attribute('disabled'), None)
-
-    def test_misplaced_items_returned_to_bank(self):
-        """
-        Test items placed to incorrect zones are returned to item bank after submitting solution
-        """
-        correct_items = {0: TOP_ZONE_ID}
-        misplaced_items = {1: BOTTOM_ZONE_ID, 2: MIDDLE_ZONE_ID}
-
-        for item_id, zone_id in correct_items.iteritems():
-            self.place_item(item_id, zone_id)
-
-        for item_id, zone_id in misplaced_items.iteritems():
-            self.place_item(item_id, zone_id)
-
-        self.click_submit()
-        for item_id in correct_items:
-            self.assert_placed_item(item_id, TOP_ZONE_TITLE, assessment_mode=True)
-
-        for item_id in misplaced_items:
-            self.assert_reverted_item(item_id)
-
-    def test_max_attempts_reached_submit_and_reset_disabled(self):
-        """
-        Test "Submit" and "Reset" buttons are disabled when no more attempts remaining
-        """
-        self.place_item(0, TOP_ZONE_ID)
-
-        submit_button, reset_button = self._get_submit_button(), self._get_reset_button()
-
-        attempts_info = self._get_attempts_info()
-
-        for index in xrange(self.MAX_ATTEMPTS):
-            expected_text = "You have used {num} of {max} attempts.".format(num=index, max=self.MAX_ATTEMPTS)
-            self.assertEqual(attempts_info.text, expected_text)  # precondition check
-            self.assertEqual(submit_button.get_attribute('disabled'), None)
-            self.assertEqual(reset_button.get_attribute('disabled'), None)
-            self.click_submit()
-
-        self.assertEqual(submit_button.get_attribute('disabled'), 'true')
-        self.assertEqual(reset_button.get_attribute('disabled'), 'true')
-
-    def test_do_attempt_feedback_is_updated(self):
-        """
-        Test updating overall feedback after submitting solution in assessment mode
-        """
-        # used keyboard mode to avoid bug/feature with selenium "selecting" everything instead of dragging an element
-        self.place_item(0, TOP_ZONE_ID, Keys.RETURN)
-
-        self.click_submit()
-
-        feedback_lines = [
-            "FEEDBACK",
-            FeedbackMessages.correctly_placed(1),
-            FeedbackMessages.not_placed(3),
-            START_FEEDBACK
-
-        ]
-        expected_feedback = "\n".join(feedback_lines)
-        self.assertEqual(self._get_feedback().text, expected_feedback)
-
-        self.place_item(1, BOTTOM_ZONE_ID, Keys.RETURN)
-        self.click_submit()
-
-        feedback_lines = [
-            "FEEDBACK",
-            FeedbackMessages.correctly_placed(1),
-            FeedbackMessages.misplaced(1),
-            FeedbackMessages.not_placed(2),
-            FeedbackMessages.MISPLACED_ITEMS_RETURNED,
-            START_FEEDBACK
-        ]
-        expected_feedback = "\n".join(feedback_lines)
-        self.assertEqual(self._get_feedback().text, expected_feedback)
-
-        # reach final attempt
-        for _ in xrange(self.MAX_ATTEMPTS-3):
-            self.click_submit()
-
-        self.place_item(1, MIDDLE_ZONE_ID, Keys.RETURN)
-        self.place_item(2, BOTTOM_ZONE_ID, Keys.RETURN)
-        self.place_item(3, TOP_ZONE_ID, Keys.RETURN)
-
-        self.click_submit()
-        feedback_lines = [
-            "FEEDBACK",
-            FeedbackMessages.correctly_placed(4),
-            FINISH_FEEDBACK,
-            FeedbackMessages.FINAL_ATTEMPT_TPL.format(score=1.0)
-        ]
-        expected_feedback = "\n".join(feedback_lines)
-        self.assertEqual(self._get_feedback().text, expected_feedback)
-
-
 class MultipleValidOptionsInteractionTest(DefaultDataTestMixin, InteractionTestBase, BaseIntegrationTest):
 
     items_map = {
diff --git a/tests/integration/test_interaction_assessment.py b/tests/integration/test_interaction_assessment.py
index 0030c876a..093c7745c 100644
--- a/tests/integration/test_interaction_assessment.py
+++ b/tests/integration/test_interaction_assessment.py
@@ -15,7 +15,7 @@
 )
 from drag_and_drop_v2.utils import FeedbackMessages
 from .test_base import BaseIntegrationTest
-from .test_interaction import InteractionTestBase, DefaultDataTestMixin
+from .test_interaction import InteractionTestBase, DefaultDataTestMixin, ParameterizedTestsMixin
 
 
 # Globals ###########################################################
@@ -57,7 +57,8 @@ def click_submit(self):
 
 @ddt
 class AssessmentInteractionTest(
-    DefaultAssessmentDataTestMixin, AssessmentTestMixin, InteractionTestBase, BaseIntegrationTest
+    DefaultAssessmentDataTestMixin, AssessmentTestMixin, ParameterizedTestsMixin,
+    InteractionTestBase, BaseIntegrationTest
 ):
     """
     Testing interactions with Drag and Drop XBlock against default data in assessment mode.