diff --git a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
index 2107f3565c8..83056d28703 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
@@ -47,13 +47,15 @@ import org.jetbrains.kotlin.types.expressions.LocalLazyDeclarationResolver
 fun StorageComponentContainer.configureModule(
     moduleContext: ModuleContext,
     platform: TargetPlatform,
-    compilerServices: PlatformDependentCompilerServices
+    compilerServices: PlatformDependentCompilerServices,
+    trace: BindingTrace
 ) {
     useInstance(moduleContext)
     useInstance(moduleContext.module)
     useInstance(moduleContext.project)
     useInstance(moduleContext.storageManager)
     useInstance(moduleContext.module.builtIns)
+    useInstance(trace)
 
     useInstance(platform)
     useInstance(compilerServices)
@@ -80,16 +82,6 @@ private fun StorageComponentContainer.configurePlatformIndependentComponents() {
     useImpl<ClassicTypeSystemContextForCS>()
 }
 
-fun StorageComponentContainer.configureModule(
-    moduleContext: ModuleContext,
-    platform: TargetPlatform,
-    compilerServices: PlatformDependentCompilerServices,
-    trace: BindingTrace
-) {
-    configureModule(moduleContext, platform, compilerServices)
-    useInstance(trace)
-}
-
 fun createContainerForBodyResolve(
     moduleContext: ModuleContext,
     bindingTrace: BindingTrace,
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/tests/di/injection.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/tests/di/injection.kt
index aa2d2c9feb7..bb631aa84aa 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/tests/di/injection.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/tests/di/injection.kt
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.types.expressions.FakeCallResolver
 fun createContainerForTests(project: Project, module: ModuleDescriptor): ContainerForTests {
     return ContainerForTests(createContainer("Tests", JvmPlatformCompilerServices) {
         configureModule(ModuleContext(module, project),
-                        JvmPlatforms.defaultJvmPlatform, JvmPlatformCompilerServices)
+                        JvmPlatforms.defaultJvmPlatform, JvmPlatformCompilerServices, BindingTraceContext())
         useInstance(LanguageVersionSettingsImpl.DEFAULT)
         useImpl<SubstitutingScopeProviderImpl>()
         useImpl<AnnotationResolverImpl>()