diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
index e2383c776f6..7fa23c08581 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
@@ -84,8 +84,6 @@ abstract class BasicBoxTest(
     private val generateNodeJsRunner: Boolean = true,
     private val targetBackend: TargetBackend = TargetBackend.JS
 ) : KotlinTestWithEnvironment() {
-    private val additionalCommonFileDirectories = mutableListOf<String>()
-
     val pathToRootOutputDir = System.getProperty("kotlin.js.test.root.out.dir") ?: error("'kotlin.js.test.root.out.dir' is not set")
     private val testGroupOutputDirForCompilation = File(pathToRootOutputDir + "out/" + testGroupOutputDirPrefix)
     private val testGroupOutputDirForMinification = File(pathToRootOutputDir + "out-min/" + testGroupOutputDirPrefix)
@@ -275,10 +273,6 @@ abstract class BasicBoxTest(
             val localCommonFile = file.parent + "/" + COMMON_FILES_NAME + JavaScript.DOT_EXTENSION
             val localCommonFiles = if (File(localCommonFile).exists()) listOf(localCommonFile) else emptyList()
 
-            val additionalCommonFiles = additionalCommonFileDirectories.flatMap { baseDir ->
-                JsTestUtils.getFilesInDirectoryByExtension(baseDir + "/", JavaScript.EXTENSION)
-            }
-
             val inputJsFilesBefore = mutableListOf<String>()
             val inputJsFilesAfter = mutableListOf<String>()
 
@@ -381,14 +375,14 @@ abstract class BasicBoxTest(
             }
 
             val allJsFiles = additionalFiles + inputJsFilesBefore + generatedJsFiles.map { it.first } + globalCommonFiles + localCommonFiles +
-                    additionalCommonFiles + additionalMainFiles + inputJsFilesAfter
+                    additionalMainFiles + inputJsFilesAfter
 
             val dceAllJsFiles = additionalFiles + inputJsFilesBefore + generatedJsFiles.map {
                 it.first.replace(
                     outputDir.absolutePath,
                     dceOutputDir.absolutePath
                 )
-            } + globalCommonFiles + localCommonFiles + additionalCommonFiles + additionalMainFiles + inputJsFilesAfter
+            } + globalCommonFiles + localCommonFiles + additionalMainFiles + inputJsFilesAfter
 
             val pirAllJsFiles = additionalFiles + inputJsFilesBefore + generatedJsFiles.map {
                 it.first.replace(
@@ -396,7 +390,7 @@ abstract class BasicBoxTest(
                     pirOutputDir.absolutePath
                 )
             } +
-                    globalCommonFiles + localCommonFiles + additionalCommonFiles + additionalMainFiles + inputJsFilesAfter
+                    globalCommonFiles + localCommonFiles + additionalMainFiles + inputJsFilesAfter
 
             val dontRunGeneratedCode =
                 InTextDirectivesUtils.dontRunGeneratedCode(targetBackend, file)
@@ -597,11 +591,8 @@ abstract class BasicBoxTest(
         val globalCommonFiles = JsTestUtils.getFilesInDirectoryByExtension(COMMON_FILES_DIR_PATH, KotlinFileType.EXTENSION)
         val localCommonFile = directory + "/" + COMMON_FILES_NAME + "." + KotlinFileType.EXTENSION
         val localCommonFiles = if (File(localCommonFile).exists()) listOf(localCommonFile) else emptyList()
-        // TODO probably it's no longer needed.
-        val additionalCommonFiles = additionalCommonFileDirectories.flatMap { baseDir ->
-            JsTestUtils.getFilesInDirectoryByExtension(baseDir + "/", KotlinFileType.EXTENSION)
-        }
-        val additionalFiles = globalCommonFiles + localCommonFiles + additionalCommonFiles
+
+        val additionalFiles = globalCommonFiles + localCommonFiles
         val allSourceFiles = (testFiles + additionalFiles).map(::File)
         val psiFiles = createPsiFiles(allSourceFiles.sortedBy { it.canonicalPath }.map { it.canonicalPath })