diff --git a/test/org/jetbrains/plugins/ideavim/action/copy/YankMotionActionTest.kt b/test/org/jetbrains/plugins/ideavim/action/copy/YankMotionActionTest.kt
index aaf110507..d793e6b73 100644
--- a/test/org/jetbrains/plugins/ideavim/action/copy/YankMotionActionTest.kt
+++ b/test/org/jetbrains/plugins/ideavim/action/copy/YankMotionActionTest.kt
@@ -23,7 +23,6 @@ import com.maddyhome.idea.vim.command.CommandState
 import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
 import com.maddyhome.idea.vim.option.ClipboardOptionsData
 import com.maddyhome.idea.vim.option.OptionsManager
-import junit.framework.Assert
 import junit.framework.TestCase
 import org.jetbrains.plugins.ideavim.VimTestCase
 
@@ -60,6 +59,7 @@ class YankMotionActionTest : VimTestCase() {
     TestCase.assertEquals(initialOffset, myFixture.editor.caretModel.offset)
   }
 
+  @Suppress("DANGEROUS_CHARACTERS")
   fun `test unnamed saved to " register`() {
     val clipboardValue = OptionsManager.clipboard.value
     OptionsManager.clipboard.set(ClipboardOptionsData.unnamed)
@@ -69,32 +69,34 @@ class YankMotionActionTest : VimTestCase() {
       typeText(parseKeys("yiw"))
 
       val starRegister = VimPlugin.getRegister().getRegister('*') ?: kotlin.test.fail("Register * is empty")
-      Assert.assertEquals("legendary", starRegister.text)
+      assertEquals("legendary", starRegister.text)
 
       val quoteRegister = VimPlugin.getRegister().getRegister('"') ?: kotlin.test.fail("Register \" is empty")
-      Assert.assertEquals("legendary", quoteRegister.text)
+      assertEquals("legendary", quoteRegister.text)
     } finally {
       OptionsManager.clipboard.set(clipboardValue)
     }
   }
 
+  @Suppress("DANGEROUS_CHARACTERS")
   fun `test z saved to " register`() {
     configureByText("I found it in a ${c}legendary land")
     typeText(parseKeys("\"zyiw"))
 
     val starRegister = VimPlugin.getRegister().getRegister('z') ?: kotlin.test.fail("Register z is empty")
-    Assert.assertEquals("legendary", starRegister.text)
+    assertEquals("legendary", starRegister.text)
 
     val quoteRegister = VimPlugin.getRegister().getRegister('"') ?: kotlin.test.fail("Register \" is empty")
-    Assert.assertEquals("legendary", quoteRegister.text)
+    assertEquals("legendary", quoteRegister.text)
   }
 
+  @Suppress("DANGEROUS_CHARACTERS")
   fun `test " saved to " register`() {
     configureByText("I found it in a ${c}legendary land")
     typeText(parseKeys("\"zyiw"))
 
     val quoteRegister = VimPlugin.getRegister().getRegister('"') ?: kotlin.test.fail("Register \" is empty")
-    Assert.assertEquals("legendary", quoteRegister.text)
+    assertEquals("legendary", quoteRegister.text)
   }
 
   fun `test yank up`() {
@@ -108,7 +110,7 @@ class YankMotionActionTest : VimTestCase() {
     """.trimIndent()
     typeTextInFile(parseKeys("yk"), file)
 
-    Assert.assertTrue(VimPlugin.isError())
+    assertTrue(VimPlugin.isError())
   }
 
   fun `test yank dollar at last empty line`() {
@@ -154,7 +156,7 @@ class YankMotionActionTest : VimTestCase() {
     """.trimIndent()
     typeTextInFile(commandToKeys("map * *yiw"), file)
     typeTextInFile(parseKeys("\"*"), file)
-    Assert.assertNull(VimPlugin.getRegister().lastRegister?.text)
+    assertNull(VimPlugin.getRegister().lastRegister?.text)
   }
 
   fun `test yank last line`() {
diff --git a/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollHalfPageDownActionTest.kt b/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollHalfPageDownActionTest.kt
index c0036fb80..9e2379fc7 100644
--- a/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollHalfPageDownActionTest.kt
+++ b/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollHalfPageDownActionTest.kt
@@ -22,7 +22,6 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
 import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
 import com.maddyhome.idea.vim.option.OptionsManager
-import junit.framework.Assert
 import org.jetbrains.plugins.ideavim.VimTestCase
 
 /*
@@ -83,7 +82,7 @@ class ScrollHalfPageDownActionTest : VimTestCase() {
     configureByPages(5)
     setPositionAndScroll(100, 110)
     typeText(parseKeys("10<C-D>"))
-    Assert.assertEquals(OptionsManager.scroll.value(), 10)
+    assertEquals(OptionsManager.scroll.value(), 10)
   }
 
   fun `test scroll downwards uses scroll option`() {
diff --git a/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollHalfPageUpActionTest.kt b/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollHalfPageUpActionTest.kt
index b6172a9f7..0d9eac6c4 100644
--- a/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollHalfPageUpActionTest.kt
+++ b/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollHalfPageUpActionTest.kt
@@ -22,7 +22,6 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
 import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
 import com.maddyhome.idea.vim.option.OptionsManager
-import junit.framework.Assert
 import org.jetbrains.plugins.ideavim.VimTestCase
 
 /*
@@ -75,7 +74,7 @@ class ScrollHalfPageUpActionTest : VimTestCase() {
     configureByPages(5)
     setPositionAndScroll(50, 53)
     typeText(parseKeys("10<C-U>"))
-    Assert.assertEquals(OptionsManager.scroll.value(), 10)
+    assertEquals(OptionsManager.scroll.value(), 10)
   }
 
   fun `test scroll upwards uses scroll option`() {
diff --git a/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollPageUpActionTest.kt b/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollPageUpActionTest.kt
index 715079a87..ca6d9359e 100644
--- a/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollPageUpActionTest.kt
+++ b/test/org/jetbrains/plugins/ideavim/action/scroll/ScrollPageUpActionTest.kt
@@ -21,7 +21,6 @@ package org.jetbrains.plugins.ideavim.action.scroll
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
 import com.maddyhome.idea.vim.option.OptionsManager
-import junit.framework.Assert
 import org.jetbrains.plugins.ideavim.VimTestCase
 
 /*
@@ -155,7 +154,7 @@ class ScrollPageUpActionTest : VimTestCase() {
     configureByPages(5)
     setPositionAndScroll(0, 25)
     typeText(parseKeys("<C-B>"))
-    Assert.assertTrue(VimPlugin.isError())
+    assertTrue(VimPlugin.isError())
   }
 
   fun `test scroll page up on second page moves cursor to previous top`() {
diff --git a/test/org/jetbrains/plugins/ideavim/extension/highlightedyank/VimHighlightedYankTest.kt b/test/org/jetbrains/plugins/ideavim/extension/highlightedyank/VimHighlightedYankTest.kt
index 8f13c96c9..3f1225ecd 100644
--- a/test/org/jetbrains/plugins/ideavim/extension/highlightedyank/VimHighlightedYankTest.kt
+++ b/test/org/jetbrains/plugins/ideavim/extension/highlightedyank/VimHighlightedYankTest.kt
@@ -23,7 +23,6 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.CommandState
 import com.maddyhome.idea.vim.extension.highlightedyank.DEFAULT_HIGHLIGHT_DURATION
 import com.maddyhome.idea.vim.helper.StringHelper
-import junit.framework.Assert
 import org.jetbrains.plugins.ideavim.SkipNeovimReason
 import org.jetbrains.plugins.ideavim.TestWithoutNeovim
 import org.jetbrains.plugins.ideavim.VimTestCase
@@ -71,7 +70,7 @@ class VimHighlightedYankTest : VimTestCase() {
     typeText(StringHelper.parseKeys(":let g:highlightedyank_highlight_duration = \"500.15\"<CR>"))
     typeText(StringHelper.parseKeys("yy"))
 
-    Assert.assertEquals(
+    assertEquals(
       VimPlugin.getMessage(),
       "highlightedyank: Invalid value of g:highlightedyank_highlight_duration -- For input string: \"500.15\""
     )
@@ -83,7 +82,7 @@ class VimHighlightedYankTest : VimTestCase() {
     typeText(StringHelper.parseKeys(":let g:highlightedyank_highlight_duration = \"-1\"<CR>"))
     typeText(StringHelper.parseKeys("yy"))
 
-    Assert.assertEquals(VimPlugin.getMessage(), "")
+    assertEquals(VimPlugin.getMessage(), "")
   }
 
   fun `test indicating error when incorrect highlight color was provided by user`() {
@@ -93,7 +92,7 @@ class VimHighlightedYankTest : VimTestCase() {
       typeText(StringHelper.parseKeys(":let g:highlightedyank_highlight_color = \"$color\"<CR>"))
       typeText(StringHelper.parseKeys("yy"))
 
-      Assert.assertTrue(
+      assertTrue(
         color,
         VimPlugin.getMessage().contains("highlightedyank: Invalid value of g:highlightedyank_highlight_color")
       )
@@ -107,7 +106,7 @@ class VimHighlightedYankTest : VimTestCase() {
       typeText(StringHelper.parseKeys(":let g:highlightedyank_highlight_color = \"$color\"<CR>"))
       typeText(StringHelper.parseKeys("yy"))
 
-      Assert.assertEquals("", VimPlugin.getMessage())
+      assertEquals("", VimPlugin.getMessage())
     }
   }
 
@@ -166,7 +165,7 @@ fun sum(x: ${c}Int, y: ${c}Int, z: ${c}Int): Int {
   }
 
   private fun assertAllHighlightersCount(count: Int) {
-    Assert.assertEquals(count, getAllHighlightersCount())
+    assertEquals(count, getAllHighlightersCount())
   }
 
   private fun getAllHighlightersCount() = myFixture.editor.markupModel.allHighlighters.size
diff --git a/test/ui/utils/Utils.kt b/test/ui/utils/Utils.kt
index e9d43130c..83b897ed1 100644
--- a/test/ui/utils/Utils.kt
+++ b/test/ui/utils/Utils.kt
@@ -61,7 +61,7 @@ fun RemoteText.moveMouseInGutterTo(goal: RemoteText, fixture: Fixture) {
   this.moveMouse()
   val goalPoint = goal.point
 
-  val caretDuringDragging = fixture.runJs(
+  fixture.runJs(
     """
     const point = new java.awt.Point(${goalPoint.x}, ${goalPoint.y});
     robot.pressMouseWhileRunning(MouseButton.LEFT_BUTTON, () => {