diff --git a/platform/configuration-store-impl/testSrc/SchemeManagerTest.kt b/platform/configuration-store-impl/testSrc/SchemeManagerTest.kt
index 4c3cec248fe8..f3d4a8898a93 100644
--- a/platform/configuration-store-impl/testSrc/SchemeManagerTest.kt
+++ b/platform/configuration-store-impl/testSrc/SchemeManagerTest.kt
@@ -374,7 +374,8 @@ private fun checkSchemes(baseDir: File, expected: String, ignoreDeleted: Boolean
   }
 }
 
-public data Tag("scheme") class TestScheme(Attribute private var name: String = "", Attribute var data: String? = null) : ExternalizableScheme {
+Tag("scheme")
+public data class TestScheme(@Attribute private var name: String = "", @Attribute public var data: String? = null) : ExternalizableScheme {
   override fun getName() = name
 
   override Transient fun setName(newName: String) {
diff --git a/plugins/settings-repository/settings-repository.iml b/plugins/settings-repository/settings-repository.iml
index 0683fab4a632..044f09219157 100644
--- a/plugins/settings-repository/settings-repository.iml
+++ b/plugins/settings-repository/settings-repository.iml
@@ -54,7 +54,7 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="Slf4j" level="project" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="configuration-store-impl" />
     <orderEntry type="module" module-name="configuration-store-tests" scope="TEST" />
     <orderEntry type="module" module-name="util-tests" scope="TEST" />