diff --git a/.idea/runConfigurations/Analysis_API_FE1_0_Tests.xml b/.idea/runConfigurations/Analysis_API_FE1_0_Tests.xml
index dabedd82060..9ed7dcd4ea1 100644
--- a/.idea/runConfigurations/Analysis_API_FE1_0_Tests.xml
+++ b/.idea/runConfigurations/Analysis_API_FE1_0_Tests.xml
@@ -4,18 +4,23 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value=":analysis:analysis-api-fe10:test --tests *" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
-        <list />
+        <list>
+          <option value=":analysis:analysis-api-fe10:test" />
+          <option value="--tests" />
+          <option value="*" />
+        </list>
       </option>
       <option name="vmOptions" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Analysis_API_FIR_Tests.xml b/.idea/runConfigurations/Analysis_API_FIR_Tests.xml
index 57122fc3662..b1164f5fadf 100644
--- a/.idea/runConfigurations/Analysis_API_FIR_Tests.xml
+++ b/.idea/runConfigurations/Analysis_API_FIR_Tests.xml
@@ -4,18 +4,23 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value=":analysis:analysis-api-fir:test --tests *" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
-        <list />
+        <list>
+          <option value=":analysis:analysis-api-fir:test" />
+          <option value="--tests" />
+          <option value="*" />
+        </list>
       </option>
       <option name="vmOptions" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Analysis_API_Standalone_FIR_Tests.xml b/.idea/runConfigurations/Analysis_API_Standalone_FIR_Tests.xml
new file mode 100644
index 00000000000..395f828c75a
--- /dev/null
+++ b/.idea/runConfigurations/Analysis_API_Standalone_FIR_Tests.xml
@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Analysis API Standalone FIR Tests" type="GradleRunConfiguration" factoryName="Gradle" folderName="Analysis">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":analysis:analysis-api-standalone:test" />
+          <option value="--tests" />
+          <option value="*" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Analysis_All_Tests.xml b/.idea/runConfigurations/Analysis_All_Tests.xml
index 49e8edda222..5144ba3bade 100644
--- a/.idea/runConfigurations/Analysis_All_Tests.xml
+++ b/.idea/runConfigurations/Analysis_All_Tests.xml
@@ -4,18 +4,23 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="analysisAllTests --tests *" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
-        <list />
+        <list>
+          <option value="analysisAllTests" />
+          <option value="--tests" />
+          <option value="*" />
+        </list>
       </option>
       <option name="vmOptions" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file