diff --git a/remote/org.eclipse.remote.console/.classpath b/remote/org.eclipse.remote.console/.classpath
index 098194ca4b7..e801ebfb468 100644
--- a/remote/org.eclipse.remote.console/.classpath
+++ b/remote/org.eclipse.remote.console/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.console/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.console/META-INF/MANIFEST.MF
index 53980e8d133..d39b2aab2de 100644
--- a/remote/org.eclipse.remote.console/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.console/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.remote.console;singleton:=true
 Bundle-Version: 1.2.0.qualifier
 Bundle-Activator: org.eclipse.remote.internal.console.Activator
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %pluginProvider
 Export-Package: org.eclipse.remote.console,
diff --git a/remote/org.eclipse.remote.core.tests/.classpath b/remote/org.eclipse.remote.core.tests/.classpath
index ad32c83a788..a42a828e04a 100644
--- a/remote/org.eclipse.remote.core.tests/.classpath
+++ b/remote/org.eclipse.remote.core.tests/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/remote/org.eclipse.remote.core.tests/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.core.tests/META-INF/MANIFEST.MF
index e29e0612a58..5e9034670f6 100644
--- a/remote/org.eclipse.remote.core.tests/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.core.tests/META-INF/MANIFEST.MF
@@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.core.filesystem;bundle-version="1.2.0",
  org.eclipse.remote.core;bundle-version="1.0.0",
  org.eclipse.remote.ui;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Activator: org.eclipse.remote.core.tests.internal.Activator
 Bundle-ActivationPolicy: lazy
diff --git a/remote/org.eclipse.remote.core/.classpath b/remote/org.eclipse.remote.core/.classpath
index 098194ca4b7..e801ebfb468 100644
--- a/remote/org.eclipse.remote.core/.classpath
+++ b/remote/org.eclipse.remote.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.core/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.core/META-INF/MANIFEST.MF
index 0af06f041d3..e679e33f6da 100644
--- a/remote/org.eclipse.remote.core/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.core/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Export-Package: org.eclipse.remote.core,
  org.eclipse.remote.internal.core;x-friends:="org.eclipse.remote.ui,org.eclipse.remote.jsch.core",
  org.eclipse.remote.internal.core.preferences;x-friends:="org.eclipse.remote.ui"
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.eclipse.cdt.utils.pty,
  org.eclipse.cdt.utils.spawner,
  org.eclipse.core.expressions,
diff --git a/remote/org.eclipse.remote.jsch.core/.classpath b/remote/org.eclipse.remote.jsch.core/.classpath
index 098194ca4b7..e801ebfb468 100644
--- a/remote/org.eclipse.remote.jsch.core/.classpath
+++ b/remote/org.eclipse.remote.jsch.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
index 95d78a01ebf..fbd7f9b5291 100644
--- a/remote/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.internal.jsch.core;x-friends:="org.eclipse.remote.jsch.ui,org.eclipse.remote.jsch.tests",
  org.eclipse.remote.internal.jsch.core.messages;x-internal:=true
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: com.jcraft.jsch,
  org.eclipse.core.filesystem,
  org.eclipse.core.filesystem.provider,
diff --git a/remote/org.eclipse.remote.jsch.tests/.classpath b/remote/org.eclipse.remote.jsch.tests/.classpath
index 098194ca4b7..a42a828e04a 100644
--- a/remote/org.eclipse.remote.jsch.tests/.classpath
+++ b/remote/org.eclipse.remote.jsch.tests/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/remote/org.eclipse.remote.jsch.tests/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.jsch.tests/META-INF/MANIFEST.MF
index eb71227a0a1..22b2e0eff5d 100644
--- a/remote/org.eclipse.remote.jsch.tests/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.jsch.tests/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.remote.core,
  org.eclipse.remote.jsch.core,
  org.junit
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/remote/org.eclipse.remote.jsch.ui/.classpath b/remote/org.eclipse.remote.jsch.ui/.classpath
index 098194ca4b7..e801ebfb468 100644
--- a/remote/org.eclipse.remote.jsch.ui/.classpath
+++ b/remote/org.eclipse.remote.jsch.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
index 1c1152219ec..d6baee37df4 100644
--- a/remote/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.internal.jsch.ui;x-internal:=true,
  org.eclipse.remote.internal.jsch.ui.messages;x-internal:=true
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: com.jcraft.jsch,
  org.eclipse.core.filesystem,
  org.eclipse.core.runtime,
diff --git a/remote/org.eclipse.remote.proxy.core/.classpath b/remote/org.eclipse.remote.proxy.core/.classpath
index eca7bdba8f0..e801ebfb468 100644
--- a/remote/org.eclipse.remote.proxy.core/.classpath
+++ b/remote/org.eclipse.remote.proxy.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.proxy.core/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.proxy.core/META-INF/MANIFEST.MF
index f379f4dcd9b..61e7276ab28 100644
--- a/remote/org.eclipse.remote.proxy.core/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.proxy.core/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Export-Package: org.eclipse.remote.internal.proxy.core;x-friends:="org.eclipse.r
  org.eclipse.remote.internal.proxy.core.commands;x-friends:="org.eclipse.remote.proxy.ui",
  org.eclipse.remote.internal.proxy.core.messages;x-friends:="org.eclipse.remote.proxy.ui"
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: 
  com.jcraft.jsch,
  org.eclipse.core.filesystem,
diff --git a/remote/org.eclipse.remote.proxy.protocol.core/.classpath b/remote/org.eclipse.remote.proxy.protocol.core/.classpath
index eca7bdba8f0..e801ebfb468 100644
--- a/remote/org.eclipse.remote.proxy.protocol.core/.classpath
+++ b/remote/org.eclipse.remote.proxy.protocol.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.proxy.protocol.core/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.proxy.protocol.core/META-INF/MANIFEST.MF
index fdfcbeb9b3b..54dbd2124db 100644
--- a/remote/org.eclipse.remote.proxy.protocol.core/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.proxy.protocol.core/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.proxy.protocol.core,
  org.eclipse.remote.proxy.protocol.core.exceptions
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.eclipse.core.filesystem,
  org.eclipse.core.filesystem.provider,
  org.eclipse.core.runtime,
diff --git a/remote/org.eclipse.remote.proxy.server.core/.classpath b/remote/org.eclipse.remote.proxy.server.core/.classpath
index eca7bdba8f0..e801ebfb468 100644
--- a/remote/org.eclipse.remote.proxy.server.core/.classpath
+++ b/remote/org.eclipse.remote.proxy.server.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.proxy.server.core/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.proxy.server.core/META-INF/MANIFEST.MF
index e20134257e4..7036867ed51 100644
--- a/remote/org.eclipse.remote.proxy.server.core/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.proxy.server.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.remote.proxy.server.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.eclipse.core.filesystem,
  org.eclipse.core.runtime,
  org.eclipse.core.runtime.adaptor,
diff --git a/remote/org.eclipse.remote.proxy.tests/.classpath b/remote/org.eclipse.remote.proxy.tests/.classpath
index 098194ca4b7..a42a828e04a 100644
--- a/remote/org.eclipse.remote.proxy.tests/.classpath
+++ b/remote/org.eclipse.remote.proxy.tests/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/remote/org.eclipse.remote.proxy.tests/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.proxy.tests/META-INF/MANIFEST.MF
index 02587dcfd29..d875038d14d 100644
--- a/remote/org.eclipse.remote.proxy.tests/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.proxy.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.remote.proxy.core,
  org.junit,
  org.eclipse.remote.proxy.protocol.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Import-Package: com.jcraft.jsch;version="0.1.53",
  org.eclipse.jsch.core,
diff --git a/remote/org.eclipse.remote.proxy.ui/.classpath b/remote/org.eclipse.remote.proxy.ui/.classpath
index eca7bdba8f0..e801ebfb468 100644
--- a/remote/org.eclipse.remote.proxy.ui/.classpath
+++ b/remote/org.eclipse.remote.proxy.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.proxy.ui/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.proxy.ui/META-INF/MANIFEST.MF
index 9baf5cb30c4..edbd12aebb0 100644
--- a/remote/org.eclipse.remote.proxy.ui/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.proxy.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.internal.proxy.ui;x-internal:=true,
  org.eclipse.remote.internal.proxy.ui.messages;x-internal:=true
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: com.jcraft.jsch,
  org.eclipse.core.filesystem,
  org.eclipse.core.runtime,
diff --git a/remote/org.eclipse.remote.serial.core/.classpath b/remote/org.eclipse.remote.serial.core/.classpath
index 098194ca4b7..e801ebfb468 100644
--- a/remote/org.eclipse.remote.serial.core/.classpath
+++ b/remote/org.eclipse.remote.serial.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.serial.core/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.serial.core/META-INF/MANIFEST.MF
index 302b788dab3..f220c9ade8e 100644
--- a/remote/org.eclipse.remote.serial.core/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.serial.core/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.remote.serial.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.serial.internal.core.Activator
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.serial.core
 Bundle-Localization: plugin
diff --git a/remote/org.eclipse.remote.serial.ui/.classpath b/remote/org.eclipse.remote.serial.ui/.classpath
index eca7bdba8f0..e801ebfb468 100644
--- a/remote/org.eclipse.remote.serial.ui/.classpath
+++ b/remote/org.eclipse.remote.serial.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.telnet.core.tests/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.telnet.core.tests/META-INF/MANIFEST.MF
index c1a6d0471d4..8bf1f937a5a 100644
--- a/remote/org.eclipse.remote.telnet.core.tests/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.telnet.core.tests/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.remote.telnet.core;bundle-version="1.0.0",
  org.junit;bundle-version="4.12.0",
  org.eclipse.remote.core;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/remote/org.eclipse.remote.telnet.core/.classpath b/remote/org.eclipse.remote.telnet.core/.classpath
index 098194ca4b7..e801ebfb468 100644
--- a/remote/org.eclipse.remote.telnet.core/.classpath
+++ b/remote/org.eclipse.remote.telnet.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF
index 358a6772519..fd056c12665 100644
--- a/remote/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.remote.telnet.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.remote.telnet.internal.core.Activator
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.telnet.core,
  org.eclipse.remote.telnet.internal.core;x-internal:=true
diff --git a/remote/org.eclipse.remote.telnet.ui/.classpath b/remote/org.eclipse.remote.telnet.ui/.classpath
index eca7bdba8f0..e801ebfb468 100644
--- a/remote/org.eclipse.remote.telnet.ui/.classpath
+++ b/remote/org.eclipse.remote.telnet.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.ui.tests/.classpath b/remote/org.eclipse.remote.ui.tests/.classpath
index eca7bdba8f0..a42a828e04a 100644
--- a/remote/org.eclipse.remote.ui.tests/.classpath
+++ b/remote/org.eclipse.remote.ui.tests/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/remote/org.eclipse.remote.ui.tests/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.ui.tests/META-INF/MANIFEST.MF
index 59633653cbc..8f5ecb567a2 100644
--- a/remote/org.eclipse.remote.ui.tests/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.ui.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Remote UI Tests
 Bundle-SymbolicName: org.eclipse.remote.ui.tests
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.eclipse.remote.ui;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.remote.core,
  org.eclipse.ui.workbench,
diff --git a/remote/org.eclipse.remote.ui/.classpath b/remote/org.eclipse.remote.ui/.classpath
index 098194ca4b7..e801ebfb468 100644
--- a/remote/org.eclipse.remote.ui/.classpath
+++ b/remote/org.eclipse.remote.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/remote/org.eclipse.remote.ui/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.ui/META-INF/MANIFEST.MF
index 2d31692179f..b5578964e18 100644
--- a/remote/org.eclipse.remote.ui/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.remote.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.remote.ui;singleton:=true
 Bundle-Version: 2.1.1.qualifier
 Bundle-Activator: org.eclipse.remote.internal.ui.RemoteUIPlugin
 Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.remote.internal.ui;x-internal:=true,
  org.eclipse.remote.internal.ui.messages;x-internal:=true,