diff --git a/pom.xml b/pom.xml
index d0a7c90..a7b3933 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
     <module>features/org.eclipse.acceleo.aql.feature</module>
 
     <module>tests/org.eclipse.acceleo.aql.rcpttproduct</module>
-    <!--module>acceleo-aql/org.eclipse.acceleo.aql.rcptt</module-->
+    <module>tests/org.eclipse.acceleo.aql.rcptt</module>
     <module>releng/org.eclipse.acceleo.aql.update</module>
   </modules>
 
diff --git a/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target b/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target
index a39aadf..1ff9e4c 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target
+++ b/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target
@@ -1,50 +1,55 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Acceleo 2019-09 Target Platform" sequenceNumber="1613728831">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
-      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
-      <unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
-      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210216215844/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.lsp4j" version="0.0.0"/>
-      <unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
-      <unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
-      <unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
-      <unit id="org.eclipse.lsp4e" version="0.0.0"/>
-      <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
-      <unit id="a.jre.javase" version="0.0.0"/>
-      <unit id="config.a.jre.javase" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/lsp4e/releases/0.13.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.core.runtime" version="0.0.0"/>
-      <unit id="org.eclipse.ui" version="0.0.0"/>
-      <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
-      <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jface" version="0.0.0"/>
-      <unit id="org.eclipse.tm4e.core" version="0.0.0"/>
-      <unit id="org.eclipse.tm4e.ui" version="0.0.0"/>
-      <unit id="org.eclipse.tm4e.languageconfiguration" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/2019-09"/>
-    </location>
-  </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Acceleo 2019-09 Target Platform" sequenceNumber="1622030916">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+      <unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
+      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210216215844/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.lsp4j" version="0.0.0"/>
+      <unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
+      <unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
+      <unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
+      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
+      <unit id="org.eclipse.lsp4e" version="0.0.0"/>
+      <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
+      <unit id="a.jre.javase" version="0.0.0"/>
+      <unit id="config.a.jre.javase" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/lsp4e/releases/0.13.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.rcptt.platform.feature.group" version="0.0.0"/>
+      <unit id="org.antlr.runtime" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/rcptt/release/2.5.1/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.core.runtime" version="0.0.0"/>
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
+      <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jface" version="0.0.0"/>
+      <unit id="org.eclipse.tm4e.core" version="0.0.0"/>
+      <unit id="org.eclipse.tm4e.ui" version="0.0.0"/>
+      <unit id="org.eclipse.tm4e.languageconfiguration" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/2019-09"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.tpd b/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.tpd
index 296306e..d995490 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.tpd
+++ b/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.tpd
@@ -3,6 +3,7 @@
 include "../common/orbit.tpd"
 include "../common/license.tpd"
 include "../common/lsp.tpd"
+include "../common/rcptt.tpd"
 
 with source requirements
 
diff --git a/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.target b/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.target
index 21ac835..e87ca8c 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.target
+++ b/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.target
@@ -1,50 +1,55 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Acceleo 2020-09 Target Platform" sequenceNumber="1613728858">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
-      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
-      <unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
-      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210216215844/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.lsp4j" version="0.0.0"/>
-      <unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
-      <unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
-      <unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
-      <unit id="org.eclipse.lsp4e" version="0.0.0"/>
-      <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
-      <unit id="a.jre.javase" version="0.0.0"/>
-      <unit id="config.a.jre.javase" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/lsp4e/releases/0.13.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.core.runtime" version="0.0.0"/>
-      <unit id="org.eclipse.ui" version="0.0.0"/>
-      <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
-      <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jface" version="0.0.0"/>
-      <unit id="org.eclipse.tm4e.core" version="0.0.0"/>
-      <unit id="org.eclipse.tm4e.ui" version="0.0.0"/>
-      <unit id="org.eclipse.tm4e.languageconfiguration" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/2020-09"/>
-    </location>
-  </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Acceleo 2020-09 Target Platform" sequenceNumber="1622030919">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+      <unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
+      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210216215844/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.lsp4j" version="0.0.0"/>
+      <unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
+      <unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
+      <unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
+      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
+      <unit id="org.eclipse.lsp4e" version="0.0.0"/>
+      <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
+      <unit id="a.jre.javase" version="0.0.0"/>
+      <unit id="config.a.jre.javase" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/lsp4e/releases/0.13.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.rcptt.platform.feature.group" version="0.0.0"/>
+      <unit id="org.antlr.runtime" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/rcptt/release/2.5.1/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.core.runtime" version="0.0.0"/>
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
+      <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jface" version="0.0.0"/>
+      <unit id="org.eclipse.tm4e.core" version="0.0.0"/>
+      <unit id="org.eclipse.tm4e.ui" version="0.0.0"/>
+      <unit id="org.eclipse.tm4e.languageconfiguration" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/2020-09"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.tpd b/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.tpd
index aa4cdb0..8726d09 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.tpd
+++ b/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.tpd
@@ -3,6 +3,7 @@
 include "../common/orbit.tpd"
 include "../common/license.tpd"
 include "../common/lsp.tpd"
+include "../common/rcptt.tpd"
 
 with source requirements
 
diff --git a/releng/org.eclipse.acceleo.targetplatforms/common/rcptt.tpd b/releng/org.eclipse.acceleo.targetplatforms/common/rcptt.tpd
new file mode 100644
index 0000000..a3ded31
--- /dev/null
+++ b/releng/org.eclipse.acceleo.targetplatforms/common/rcptt.tpd
@@ -0,0 +1,8 @@
+target "RCPTT"
+
+with source, requirements
+
+location "http://download.eclipse.org/rcptt/release/2.5.1/repository" {
+	org.eclipse.rcptt.platform.feature.group lazy
+	org.antlr.runtime lazy
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.acceleo.aql.rcptt/Debug/LaunchShortcutDebug.test b/tests/org.eclipse.acceleo.aql.rcptt/Debug/LaunchShortcutDebug.test
index e31eb3b..f419008 100644
--- a/tests/org.eclipse.acceleo.aql.rcptt/Debug/LaunchShortcutDebug.test
+++ b/tests/org.eclipse.acceleo.aql.rcptt/Debug/LaunchShortcutDebug.test
@@ -6,7 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _azpG8MEqEeqjcPTfvO5d8Q
-Save-Time: 9/1/20, 3:28 PM
+Save-Time: 5/26/21 3:10 PM
+Tags: fail
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
diff --git a/tests/org.eclipse.acceleo.aql.rcptt/Editor/CreateNewTemplate.test b/tests/org.eclipse.acceleo.aql.rcptt/Editor/CreateNewTemplate.test
index 36f5937..133dbb2 100644
--- a/tests/org.eclipse.acceleo.aql.rcptt/Editor/CreateNewTemplate.test
+++ b/tests/org.eclipse.acceleo.aql.rcptt/Editor/CreateNewTemplate.test
@@ -1,12 +1,12 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _Ayow4KrpEeqpkej7GeVvKQ,_d8d2kKyFEeqylZAj0d4Xnw
+Contexts: _d8d2kKyFEeqylZAj0d4Xnw,_Ayow4KrpEeqpkej7GeVvKQ
 Element-Name: CreateNewTemplate
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _CxR7IMEfEeqjcPTfvO5d8Q
-Save-Time: 7/8/20 3:30 PM
+Save-Time: 5/26/21 2:40 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
diff --git a/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/ModuleImport.test b/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/ModuleImport.test
index e20930c..5d687bd 100644
--- a/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/ModuleImport.test
+++ b/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/ModuleImport.test
@@ -6,7 +6,7 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _AZJXYMElEeqjcPTfvO5d8Q
-Save-Time: 7/8/20 4:13 PM
+Save-Time: 5/26/21 2:46 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -20,8 +20,5 @@
     open-declaration
 }
 get-editor "otherModule.mtl" | get-text-viewer | get-property "getSelectionText()" 
-    | equals "[module otherModule('http://www.eclipse.org/emf/2002/Ecore')/]\n\n"
-    + "[template public myOtherTemplate(myParam : ecore::EClassifier)]\n"
-    + "  [myParam.name/].\n"
-    + "[/template]" | verify-true
+    | equals "otherModule" | verify-true
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/TemplateInOtherModule.test b/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/TemplateInOtherModule.test
index 84834c0..c325d66 100644
--- a/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/TemplateInOtherModule.test
+++ b/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/TemplateInOtherModule.test
@@ -6,7 +6,7 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _Omj4UMElEeqjcPTfvO5d8Q
-Save-Time: 7/8/20 4:18 PM
+Save-Time: 5/26/21 2:46 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -20,9 +20,7 @@
     open-declaration
 }
 get-editor "otherModule.mtl" | get-text-viewer | get-property "getSelectionText()" 
-    | equals "[template public myOtherTemplate(myParam : ecore::EClassifier)]\n"
-    + "  [myParam.name/].\n"
-    + "[/template]" | verify-true
+    | equals "myOtherTemplate" | verify-true
 get-view "Package Explorer" | get-button "Link with Editor" | click -metaKeys ""
 with [get-view "Package Explorer" | get-tree] {
     get-property "selection[0].path[0]" | equals test | verify-true
diff --git a/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/Variable.test b/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/Variable.test
index 70e8dff..cbf4691 100644
--- a/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/Variable.test
+++ b/tests/org.eclipse.acceleo.aql.rcptt/Editor/OpenDeclaration/Variable.test
@@ -6,7 +6,7 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _wlxlQMEkEeqjcPTfvO5d8Q
-Save-Time: 7/8/20 4:11 PM
+Save-Time: 5/26/21 2:45 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -20,5 +20,5 @@
     open-declaration
 }
 get-editor "test.mtl" | get-text-viewer | get-property "getSelectionText()" 
-    | equals "myVariable1 : ecore::EClassifier | myParam.eClassifiers" | verify-true
+    | equals "myVariable1" | verify-true
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.eclipse.acceleo.aql.rcpttproduct/acceleo.product b/tests/org.eclipse.acceleo.aql.rcpttproduct/acceleo.product
index 9c3a81c..2d60ca0 100644
--- a/tests/org.eclipse.acceleo.aql.rcpttproduct/acceleo.product
+++ b/tests/org.eclipse.acceleo.aql.rcpttproduct/acceleo.product
@@ -108,16 +108,19 @@
       <feature id="org.eclipse.acceleo.aql.feature"/>
       <feature id="org.eclipse.acceleo.query.jdt"/>
       <feature id="org.eclipse.jdt"/>
+      <feature id="org.eclipse.equinox.core.feature"/>
+      <feature id="org.eclipse.equinox.executable"/>
       <feature id="org.eclipse.pde"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc"/>
       <feature id="org.eclipse.acceleo.query"/>
+      <feature id="org.eclipse.rcptt.platform"/>
    </features>
 
    <configurations>
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
@@ -125,12 +128,6 @@
       <property name="osgi.instance.area.default" value="@user.home/acceleows" os="macosx" />
    </configurations>
 
-   <repositories>
-      <repository location="http://download.eclipse.org/releases/2019-09" enabled="true" />
-      <repository location="http://https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository" enabled="true" />
-      <repository location="http://download.eclipse.org/rcptt/release/2.5.1/repository" enabled="true" />
-   </repositories>
-
    <preferencesInfo>
       <targetfile overwrite="false"/>
    </preferencesInfo>