diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt
index b005d538d87..7faf8a82b53 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt
@@ -58,7 +58,7 @@ open class KtUltraLightClass(classOrObject: KtClassOrObject, internal val suppor
         // This property may be removed once IntelliJ versions earlier than 2018.3 become unsupported
         // And usages of that property may be replaced with relevant registry key
         @Volatile
-        @TestOnly
+        @get:TestOnly
         var forceUsingUltraLightClasses = false
     }
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
index 7f69bac6681..cf01c91b068 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
@@ -408,7 +408,7 @@ private fun getAnnotationName(callee: KtExpression): String? {
     return null
 }
 
-@TestOnly
+@get:TestOnly
 var accessAnnotationsClsDelegateIsAllowed = false
 
 @TestOnly
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/PsiBasedClassResolver.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/PsiBasedClassResolver.kt
index 867189d6477..be0074474bd 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/PsiBasedClassResolver.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/PsiBasedClassResolver.kt
@@ -62,11 +62,11 @@ class PsiBasedClassResolver @TestOnly constructor(private val targetClassFqName:
     private var forceAmbiguityForNonAnnotations: Boolean = false
 
     companion object {
-        @TestOnly
+        @get:TestOnly
         val attempts = AtomicInteger()
-        @TestOnly
+        @get:TestOnly
         val trueHits = AtomicInteger()
-        @TestOnly
+        @get:TestOnly
         val falseHits = AtomicInteger()
 
         private val PSI_BASED_CLASS_RESOLVER_KEY = Key<CachedValue<PsiBasedClassResolver>>("PsiBasedClassResolver")
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt
index 041fb8bf795..618b1a76fd8 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt
@@ -72,7 +72,7 @@ class ExpressionsOfTypeProcessor(
     private val possibleMatchHandler: (KtExpression) -> Unit,
     private val possibleMatchesInScopeHandler: (SearchScope) -> Unit
 ) {
-    @TestOnly
+    /** For tests only */
     enum class Mode {
         ALWAYS_SMART,
         ALWAYS_PLAIN,
@@ -80,9 +80,10 @@ class ExpressionsOfTypeProcessor(
     }
 
     companion object {
-        @TestOnly
+        @get:TestOnly
         var mode = if (ApplicationManager.getApplication().isUnitTestMode) Mode.ALWAYS_SMART else Mode.PLAIN_WHEN_NEEDED
-        @TestOnly
+
+        @get:TestOnly
         var testLog: MutableList<String>? = null
 
         inline fun testLog(s: () -> String) {
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionBindingContextProvider.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionBindingContextProvider.kt
index 8291759f1dd..bbb2778704c 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionBindingContextProvider.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionBindingContextProvider.kt
@@ -53,7 +53,7 @@ import java.util.*
 class CompletionBindingContextProvider(project: Project) {
     private val LOG = Logger.getInstance(CompletionBindingContextProvider::class.java)
 
-    @TestOnly
+    @get:TestOnly
     internal var TEST_LOG: StringBuilder? = null
 
     companion object {
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/DebuggerUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/DebuggerUtils.kt
index 4c1273b2fdf..9d45158ce75 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/DebuggerUtils.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/DebuggerUtils.kt
@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull
 import java.util.*
 
 object DebuggerUtils {
-    @TestOnly
+    @get:TestOnly
     var forceRanking = false
 
     fun findSourceFileForClassIncludeLibrarySources(
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
index 53644532c87..873c6312e06 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
@@ -286,7 +286,7 @@ class KotlinCodeFragmentFactory : CodeFragmentFactory() {
     companion object {
         private val LOG = Logger.getInstance(this::class.java)
 
-        @TestOnly
+        @get:TestOnly
         val DEBUG_CONTEXT_FOR_TESTS: Key<DebuggerContextImpl> = Key.create("DEBUG_CONTEXT_FOR_TESTS")
 
         const val FAKE_JAVA_CONTEXT_FUNCTION_NAME = "_java_locals_debug_fun_"
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ToolWindowScratchOutputHandler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ToolWindowScratchOutputHandler.kt
index e420b5b013b..d9c1f2152c8 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ToolWindowScratchOutputHandler.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ToolWindowScratchOutputHandler.kt
@@ -168,7 +168,6 @@ private class ScratchToolWindowFactory : ToolWindowFactory {
     }
 }
 
-@TestOnly
 private object TestOutputHandler : ScratchOutputHandlerAdapter() {
     override fun handle(file: ScratchFile, expression: ScratchExpression, output: ScratchOutput) {
         testPrint(file, output.text, expression)
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
index 8e3c8d390eb..bf8caac13a6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
@@ -376,6 +376,6 @@ class KotlinCopyPasteReferenceProcessor : CopyPastePostProcessor<KotlinReference
     }
 
     companion object {
-        @TestOnly var declarationsToImportSuggested: Collection<String> = emptyList()
+        @get:TestOnly var declarationsToImportSuggested: Collection<String> = emptyList()
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/postfix/KtPostfixTemplateProvider.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/postfix/KtPostfixTemplateProvider.kt
index 69e5adffe06..5e7a4c30712 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/postfix/KtPostfixTemplateProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/postfix/KtPostfixTemplateProvider.kt
@@ -80,7 +80,7 @@ class KtPostfixTemplateProvider : PostfixTemplateProvider {
         /**
          * In tests only one expression should be suggested, so in case there are many of them, save relevant items
          */
-        @TestOnly
+        @get:TestOnly
         @Volatile
         var previouslySuggestedExpressions = emptyList<String>()
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
index 182640881b7..2b7d80ac401 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
@@ -195,7 +195,7 @@ class ConvertJavaCopyPasteProcessor : CopyPastePostProcessor<TextBlockTransferab
     }
 
     companion object {
-        @TestOnly var conversionPerformed: Boolean = false
+        @get:TestOnly var conversionPerformed: Boolean = false
     }
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt
index 6ce007f5472..e2b79d04625 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt
@@ -281,6 +281,6 @@ class ConvertTextJavaCopyPasteProcessor : CopyPastePostProcessor<TextBlockTransf
     }
 
     companion object {
-        @TestOnly var conversionPerformed: Boolean = false
+        @get:TestOnly var conversionPerformed: Boolean = false
     }
 }
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt b/idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
similarity index 99%
rename from idea/idea-core/src/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
rename to idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
index 2f8ac48de09..e4cbf5fda10 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
  * that can be found in the license/LICENSE.txt file.
  */
 
@@ -27,7 +27,6 @@ fun UsefulTestCase.forceUsingUltraLightClassesForTest() {
     })
 }
 
-@TestOnly
 object UltraLightChecker {
     fun checkClassEquivalence(file: KtFile) {
         for (ktClass in allClasses(file)) {