diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
index 31b74e432f85..7aad277b5972 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
@@ -92,9 +92,7 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
       Module module = node.getUserData(MODULE_KEY);
       if (module != null) {
         String productionModuleId = node.getData().getProductionModuleId();
-        if (productionModuleId != null) {
-          modelsProvider.setTestModuleProperties(module, productionModuleId);
-        }
+        modelsProvider.setTestModuleProperties(module, productionModuleId);
         setModuleOptions(module, node);
         ModifiableRootModel modifiableRootModel = modelsProvider.getModifiableRootModel(module);
         syncPaths(module, modifiableRootModel, node.getData());
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
index 4d048250f202..ed082c5fab4c 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
@@ -206,8 +206,8 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
           }
         }
         else {
-          sourceSetData.setProductionModuleId(getInternalModuleName(gradleModule, "main"));
           if ("test".equals(sourceSet.getName())) {
+            sourceSetData.setProductionModuleId(getInternalModuleName(gradleModule, "main"));
             final Set<File> testsArtifacts = externalProject.getArtifactsByConfiguration().get("tests");
             if (testsArtifacts != null) {
               artifacts.addAll(testsArtifacts);