diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java
index ce80821..10a0ded 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java
@@ -197,11 +197,11 @@
 	 // add 14 specific test here (check duplicates)
 	 ArrayList since_14 = new ArrayList();
 	 since_14.add(SwitchExpressionsYieldTest.class);
-//{ObjectTeams: wrong in JDT
+/*{ObjectTeams: wrong in JDT
 	 since_14.add(RecordsRestrictedClassTest.class);
 	 since_14.add(PatternMatching16Test.class);
 	 since_14.add(JavadocTestForRecord.class);
-// SH}
+SH} */
 	 since_14.add(BatchCompilerTest_14.class);
 
 	 // add 15 specific test here (check duplicates)
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests.java
index d2167f2..ec72393 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests.java
@@ -12915,9 +12915,6 @@
 			assertResults(
 				"[POTENTIAL_METHOD_DECLARATION]{, LCompletionSuperClass;, ()V, , null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
 				"abstract[KEYWORD]{abstract, null, null, abstract, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
-//{ObjectTeams: new keyword:
-				"callin[KEYWORD]{callin, null, null, callin, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
-// SH}
 				"class[KEYWORD]{class, null, null, class, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
 				"enum[KEYWORD]{enum, null, null, enum, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
 				"final[KEYWORD]{final, null, null, final, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
@@ -12929,9 +12926,6 @@
 				"static[KEYWORD]{static, null, null, static, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
 				"strictfp[KEYWORD]{strictfp, null, null, strictfp, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
 				"synchronized[KEYWORD]{synchronized, null, null, synchronized, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
-//{ObjectTeams: new keyword:
-				"team[KEYWORD]{team, null, null, team, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
-// SH}
 				"transient[KEYWORD]{transient, null, null, transient, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
 				"volatile[KEYWORD]{volatile, null, null, volatile, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
 				"CompletionMethodDeclaration5[TYPE_REF]{CompletionMethodDeclaration5, , LCompletionMethodDeclaration5;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests10.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests10.java
index 1ea9c40..7b934a5 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests10.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests10.java
@@ -224,12 +224,7 @@
             "expectedTypesKeys=null",
             result.context);
 
-//{ObjectTeams: additional proposals "callin" and "team":
-/* orig:
 	assertProposalCount("var[KEYWORD]", 0, 21, result);
-  :giro */
-	assertProposalCount("var[KEYWORD]", 0, 23, result);
-// SH}
 }
 	public void test0009_in_formal_param_lists() throws JavaModelException {
 		CompletionResult result = complete(
@@ -246,12 +241,7 @@
 	            "expectedTypesSignatures=null\n" +
 	            "expectedTypesKeys=null",
 	            result.context);
-//{ObjectTeams: additional proposals "callin" and "team":
-/* orig:
 		assertProposalCount("var[KEYWORD]", 0, 15, result);
-  :giro */
-		assertProposalCount("var[KEYWORD]", 0, 17, result);
-// SH}
 	}
 
 public void testbug_529556_missing_type_info_on_vars() throws JavaModelException {
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests18.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests18.java
index 83c77c1..214ca75 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests18.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests18.java
@@ -3253,7 +3253,6 @@
 			"static[KEYWORD]{static, null, null, static, null, "+keywordRelevance+"}\n" +
 			"strictfp[KEYWORD]{strictfp, null, null, strictfp, null, "+keywordRelevance+"}\n" +
 			"synchronized[KEYWORD]{synchronized, null, null, synchronized, null, "+keywordRelevance+"}\n" +
-			"team[KEYWORD]{team, null, null, team, null, "+keywordRelevance+"}\n" +
 			"transient[KEYWORD]{transient, null, null, transient, null, "+keywordRelevance+"}\n" +
 			"volatile[KEYWORD]{volatile, null, null, volatile, null, "+keywordRelevance+"}\n" +
 			"Foo[TYPE_REF]{Foo, , LFoo;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED + R_CASE + R_UNQUALIFIED)+"}\n" +
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/META-INF/MANIFEST.MF
index 26fd4b1..5f57e00 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: AccumulatedBases;singleton:=true
 Automatic-Module-Name: AccumulatedBased
 Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.debug.ui,
  org.eclipse.objectteams.otequinox,
  org.eclipse.jdt.debug.ui,
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base419987/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base419987/META-INF/MANIFEST.MF
index 7772381..4c3a93d 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base419987/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base419987/META-INF/MANIFEST.MF
@@ -4,4 +4,4 @@
 Automatic-Module-Name: Base419987
 Bundle-Version: 1.0.0.qualifier
 Export-Package: internal;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base484275/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base484275/META-INF/MANIFEST.MF
index 31d57b4..36d6364 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base484275/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base484275/META-INF/MANIFEST.MF
@@ -4,4 +4,4 @@
 Automatic-Module-Name: Base484275
 Bundle-Version: 1.0.0.qualifier
 Export-Package: internal;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug419987/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug419987/META-INF/MANIFEST.MF
index c775bea..4738a7f 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug419987/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug419987/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@
 Bundle-Version: 1.0.0.qualifier
 Export-Package: teams
 Require-Bundle: Base419987;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug484275/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug484275/META-INF/MANIFEST.MF
index d79ee3c..5098bd4 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug484275/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug484275/META-INF/MANIFEST.MF
@@ -5,5 +5,5 @@
 Bundle-Version: 1.0.0.qualifier
 Export-Package: teams
 Require-Bundle: Base484275;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254aspect/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254aspect/META-INF/MANIFEST.MF
index 70e03c4..0b2bc2d 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254aspect/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254aspect/META-INF/MANIFEST.MF
@@ -6,6 +6,6 @@
 Require-Bundle: org.eclipse.objectteams.otequinox,
  Bug494254base1;bundle-version="1.0.0"
 Automatic-Module-Name: Bug494254aspect
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: bug494254aspect
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254base0/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254base0/META-INF/MANIFEST.MF
index 07173f9..f0b5ee8 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254base0/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254base0/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@
 Bundle-SymbolicName: Bug494254base0
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: Base0_494254
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: p0;x-friends:="Bug494254base1"
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254base1/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254base1/META-INF/MANIFEST.MF
index 8e2230f..cd45281 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254base1/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug494254base1/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@
 Bundle-SymbolicName: Bug494254base1
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: Base1_494254
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: Bug494254base0;bundle-version="1.0.0";visibility:=reexport
 Export-Package: p1
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug495489/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug495489/META-INF/MANIFEST.MF
index 0113982..e0ca0cc 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug495489/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug495489/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@
 Automatic-Module-Name: Bug484275
 Bundle-Version: 1.0.0.qualifier
 Export-Package: teams
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/META-INF/MANIFEST.MF
index 6bae136..9f22095 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@
  org.eclipse.objectteams.otequinox,
  Trac18b
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213a/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213a/META-INF/MANIFEST.MF
index 786fcf5..13d03a3 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213a/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213a/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@
  Trac213b1;bundle-version="1.0.0",
  Trac213b2;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: trac213a
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b1/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b1/META-INF/MANIFEST.MF
index f1d94b9..ba0f256 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b1/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b1/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@
 Bundle-Activator: trac213b1.Activator1
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: trac213b1
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b2/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b2/META-INF/MANIFEST.MF
index d419baf..2b62aaf 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b2/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b2/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@
 Bundle-Activator: trac213b2.Activator2
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: trac213b2
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304b/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304b/META-INF/MANIFEST.MF
index 3642e39..f12a9b4 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304b/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304b/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
 Eclipse-ExtensibleAPI: true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: trac304b
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304ot/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304ot/META-INF/MANIFEST.MF
index fde3eca..1dea836 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304ot/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304ot/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@
  org.eclipse.objectteams.otequinox,
  Trac304b;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: trac304b
 Export-Package: trac304ot;ot-aspect-host=Trac304ot
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/UnresolvedBasePlugin/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/UnresolvedBasePlugin/META-INF/MANIFEST.MF
index 211d4ae..4a2d531 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/UnresolvedBasePlugin/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/UnresolvedBasePlugin/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@
 Require-Bundle: org.eclipse.objectteams.otequinox,
  org.eclipse.objectteams.runtime
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: pack
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/model/OTCompletionTests.java b/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/model/OTCompletionTests.java
index 05b97e0..df44959 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/model/OTCompletionTests.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/model/OTCompletionTests.java
@@ -233,7 +233,7 @@
 
 	assertResults(
 		"check[METHOD_REF]{check(), LCompletionBaseclass;, ()Z, check, null, "+
-		(R_DEFAULT+R_RESOLVED+R_INTERESTING+R_CASE+R_NON_STATIC+R_NON_RESTRICTED)+"}",
+		(R_DEFAULT+R_RESOLVED+R_INTERESTING+R_CASE+R_NON_STATIC+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE)+"}",
 		requestor.getResults());
 }