diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
similarity index 100%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
rename to compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt
similarity index 100%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt
rename to compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt
similarity index 100%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt
rename to compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt
similarity index 100%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt
rename to compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTestWithStdlib.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTestWithStdlib.kt
similarity index 100%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTestWithStdlib.kt
rename to compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTestWithStdlib.kt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestLightTreeHelper.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestLightTreeHelper.kt
similarity index 100%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestLightTreeHelper.kt
rename to compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestLightTreeHelper.kt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt
similarity index 100%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt
rename to compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/TableRendering.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/TableRendering.kt
similarity index 98%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/TableRendering.kt
rename to compiler/tests-common/tests/org/jetbrains/kotlin/fir/TableRendering.kt
index 714cf9902f8..5cb39e1913c 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/TableRendering.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/TableRendering.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/VMCounters.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/VMCounters.kt
similarity index 96%
rename from compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/VMCounters.kt
rename to compiler/tests-common/tests/org/jetbrains/kotlin/fir/VMCounters.kt
index 3adf37967bf..236d9fe38b9 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/VMCounters.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/VMCounters.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */