diff --git a/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/FileStructureSuggesterPythonTest.kt b/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/FileStructureSuggesterPythonTest.kt
index 28716e6dd6b8..436560c2c4d6 100644
--- a/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/FileStructureSuggesterPythonTest.kt
+++ b/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/FileStructureSuggesterPythonTest.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.python.featuresTrainer.ifs
+package com.jetbrains.python.featureTraining.ifs
 
-import junit.framework.TestCase
 import training.featuresSuggester.FeatureSuggesterTestUtils.focusEditor
 import training.featuresSuggester.FeatureSuggesterTestUtils.logicalPositionToOffset
 import training.featuresSuggester.FeatureSuggesterTestUtils.performFindInFileAction
@@ -70,7 +69,7 @@ class FileStructureSuggesterPythonTest : FileStructureSuggesterTest() {
     }
 
     testInvokeLater(myFixture.project) {
-      TestCase.assertTrue(expectedSuggestion is NoSuggestion)
+      assertTrue(expectedSuggestion is NoSuggestion)
     }
   }
 
@@ -82,7 +81,7 @@ class FileStructureSuggesterPythonTest : FileStructureSuggesterTest() {
     }
 
     testInvokeLater(myFixture.project) {
-      TestCase.assertTrue(expectedSuggestion is NoSuggestion)
+      assertTrue(expectedSuggestion is NoSuggestion)
     }
   }
 
@@ -94,7 +93,7 @@ class FileStructureSuggesterPythonTest : FileStructureSuggesterTest() {
     }
 
     testInvokeLater(myFixture.project) {
-      TestCase.assertTrue(expectedSuggestion is NoSuggestion)
+      assertTrue(expectedSuggestion is NoSuggestion)
     }
   }
 
@@ -106,7 +105,7 @@ class FileStructureSuggesterPythonTest : FileStructureSuggesterTest() {
     }
 
     testInvokeLater(myFixture.project) {
-      TestCase.assertTrue(expectedSuggestion is NoSuggestion)
+      assertTrue(expectedSuggestion is NoSuggestion)
     }
   }
 
@@ -118,7 +117,7 @@ class FileStructureSuggesterPythonTest : FileStructureSuggesterTest() {
     }
 
     testInvokeLater(myFixture.project) {
-      TestCase.assertTrue(expectedSuggestion is NoSuggestion)
+      assertTrue(expectedSuggestion is NoSuggestion)
     }
   }
 }
diff --git a/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/IntroduceVariableSuggesterPythonTest.kt b/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/IntroduceVariableSuggesterPythonTest.kt
index 077088b548d1..f01364164468 100644
--- a/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/IntroduceVariableSuggesterPythonTest.kt
+++ b/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/IntroduceVariableSuggesterPythonTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.python.featuresTrainer.ifs
+package com.jetbrains.python.featureTraining.ifs
 
 import training.featuresSuggester.FeatureSuggesterTestUtils.copyCurrentSelection
 import training.featuresSuggester.FeatureSuggesterTestUtils.cutBetweenLogicalPositions
diff --git a/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/LineCommentingSuggesterPythonTest.kt b/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/LineCommentingSuggesterPythonTest.kt
index 136b41eb632f..ef4a1cba9fcc 100644
--- a/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/LineCommentingSuggesterPythonTest.kt
+++ b/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/LineCommentingSuggesterPythonTest.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.python.featuresTrainer.ifs
+package com.jetbrains.python.featureTraining.ifs
 
-import junit.framework.TestCase
 import training.featuresSuggester.FeatureSuggesterTest
 import training.featuresSuggester.FeatureSuggesterTestUtils.insertNewLineAt
 import training.featuresSuggester.FeatureSuggesterTestUtils.moveCaretToLogicalPosition
@@ -59,7 +58,7 @@ class LineCommentingSuggesterPythonTest : FeatureSuggesterTest() {
     }
 
     testInvokeLater(myFixture.project) {
-      TestCase.assertTrue(expectedSuggestion is NoSuggestion)
+      assertTrue(expectedSuggestion is NoSuggestion)
     }
   }
 
@@ -74,7 +73,7 @@ class LineCommentingSuggesterPythonTest : FeatureSuggesterTest() {
     }
 
     testInvokeLater(myFixture.project) {
-      TestCase.assertTrue(expectedSuggestion is NoSuggestion)
+      assertTrue(expectedSuggestion is NoSuggestion)
     }
   }
 
@@ -96,7 +95,7 @@ class LineCommentingSuggesterPythonTest : FeatureSuggesterTest() {
     }
 
     testInvokeLater(myFixture.project) {
-      TestCase.assertTrue(expectedSuggestion is NoSuggestion)
+      assertTrue(expectedSuggestion is NoSuggestion)
     }
   }
 }
diff --git a/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/PythonSuggestersTestUtils.kt b/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/PythonSuggestersTestUtils.kt
index e1156bc8bfe1..c58163c59a61 100644
--- a/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/PythonSuggestersTestUtils.kt
+++ b/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/PythonSuggestersTestUtils.kt
@@ -1,4 +1,4 @@
-package com.intellij.python.featuresTrainer.ifs
+package com.jetbrains.python.featureTraining.ifs
 
 import com.intellij.testFramework.PlatformTestUtil
 import java.io.File
diff --git a/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/ReplaceCompletionSuggesterPythonTest.kt b/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/ReplaceCompletionSuggesterPythonTest.kt
index 6ed269b55179..420ab607e4c7 100644
--- a/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/ReplaceCompletionSuggesterPythonTest.kt
+++ b/python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/ReplaceCompletionSuggesterPythonTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.python.featuresTrainer.ifs
+package com.jetbrains.python.featureTraining.ifs
 
 import training.featuresSuggester.FeatureSuggesterTestUtils.chooseCompletionItem
 import training.featuresSuggester.FeatureSuggesterTestUtils.deleteTextBetweenLogicalPositions