diff --git a/build-tests.xml b/build-tests.xml
index 5458ad76..de6681e8 100644
--- a/build-tests.xml
+++ b/build-tests.xml
@@ -7,6 +7,7 @@
   <property name="build.layout" location="${build.dir}/artifacts/io.lionweb.mps.tests" />
   <property name="mps_home" location="" />
   <property name="lioncore-mps.home" location="${basedir}" />
+  <property name="mps.macro.lioncore-mps.home" location="${lioncore-mps.home}" />
   <property name="mps-extensions-home" location="${basedir}/build/dependencies/de.itemis.mps.extensions" />
   <property name="version" value="SET_FROM_GRADLE" />
   <property name="artifacts.mps" location="${mps_home}" />
@@ -666,12 +667,10 @@
           <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
           <language id="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" />
           <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
-          <language id="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" />
           <language id="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" />
           <language id="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" />
           <language id="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" />
           <language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
-          <language id="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
@@ -1166,6 +1165,7 @@
       
       <macro name="mps_home" path="${mps_home}" />
       <macro name="lioncore-mps.home" path="${lioncore-mps.home}" />
+      <macro name="mps.macro.lioncore-mps.home" path="${mps.macro.lioncore-mps.home}" />
       <macro name="mps-extensions-home" path="${mps-extensions-home}" />
     </gentest>
   </target>
@@ -1298,6 +1298,7 @@
       </jvmargs>
       <macro name="mps_home" path="${mps_home}" />
       <macro name="lioncore-mps.home" path="${lioncore-mps.home}" />
+      <macro name="mps.macro.lioncore-mps.home" path="${mps.macro.lioncore-mps.home}" />
       <macro name="mps-extensions-home" path="${mps-extensions-home}" />
     </generate>
   </target>
@@ -2229,6 +2230,7 @@
       <env key="JAVA_TOOL_OPTIONS" value="-Dplugin.path=&quot;${mps.plugins.path.string}&quot; -Dmps.libraries=&quot;${mps.libraries.path.string}&quot; -Dmps.test.modules=&quot;${mps.tests.path.string}&quot;" />
       
       
+      <sysproperty key="mps.macro.lioncore-mps.home" value="${lioncore-mps.home}" />
       
       <test name="jetbrains.mps.testbench.junit.suites.AntModuleTestSuite0" outfile="TEST-jetbrains.mps.testbench.junit.suites.AntModuleTestSuite0-lionweb-mps.build.tests" />
       <formatter type="xml" />
diff --git a/solutions/io.lionweb.mps.build.tests/models/io.lionweb.mps.build.tests.mps b/solutions/io.lionweb.mps.build.tests/models/io.lionweb.mps.build.tests.mps
index 33be8ed8..96064b42 100644
--- a/solutions/io.lionweb.mps.build.tests/models/io.lionweb.mps.build.tests.mps
+++ b/solutions/io.lionweb.mps.build.tests/models/io.lionweb.mps.build.tests.mps
@@ -1204,6 +1204,12 @@
       <property role="TrG5h" value="lioncore-mps.home" />
       <node concept="55IIr" id="5wsogBcGDOm" role="398pKh" />
     </node>
+    <node concept="398rNT" id="6M8SgVvYNwF" role="1l3spd">
+      <property role="TrG5h" value="mps.macro.lioncore-mps.home" />
+      <node concept="398BVA" id="6M8SgVvYNwU" role="398pKh">
+        <ref role="398BVh" node="5wsogBcGDOl" resolve="lioncore-mps.home" />
+      </node>
+    </node>
     <node concept="398rNT" id="18UigYQ8dx6" role="1l3spd">
       <property role="TrG5h" value="mps-extensions-home" />
       <node concept="55IIr" id="18UigYQ8dxg" role="398pKh">