diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/.project b/containers/org.eclipse.linuxtools.docker.tests-feature/.project
deleted file mode 100644
index d176de8c3a..0000000000
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.linuxtools.docker-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.core.resources.prefs b/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203..0000000000
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.m2e.core.prefs b/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb..0000000000
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/build.properties b/containers/org.eclipse.linuxtools.docker.tests-feature/build.properties
deleted file mode 100644
index 155886c3eb..0000000000
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               p2.inf
-src.includes = feature.xml,\
-               feature.properties,\
-               build.properties,\
-               .classpath,\
-               .project
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/feature.properties b/containers/org.eclipse.linuxtools.docker.tests-feature/feature.properties
deleted file mode 100644
index 39aac07510..0000000000
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/feature.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# features.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-featureProvider=Eclipse Linux Tools
-featureName=Docker Tooling Tests
-featureDescription=The Docker Tooling Tests feature provides test-suite plug-ins for testing the Eclipse Docker Tooling plug-ins.
-copyright=Copyright 2014, 2015 Red Hat, Inc.
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/feature.xml b/containers/org.eclipse.linuxtools.docker.tests-feature/feature.xml
deleted file mode 100644
index 8abc52ca87..0000000000
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/feature.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.linuxtools.docker.tests.feature"
-      label="%featureName"
-      version="5.16.0.qualifier"
-      provider-name="%featureProvider"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description url="http://www.eclipse.org/linuxtools">
-      %featureDescription
-   </description>
-
-   <copyright url="http://www.redhat.com">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="Linux Tools Docker Update Site" url="http://download.eclipse.org/linuxtools/update-docker"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.linuxtools.docker.feature" version="3.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.linuxtools.docker.reddeer"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.linuxtools.docker.integration.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.linuxtools.docker.ui.tests"
-         version="0.0.0"/>
-
-</feature>
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/p2.inf b/containers/org.eclipse.linuxtools.docker.tests-feature/p2.inf
deleted file mode 100644
index 7b2506b518..0000000000
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/p2.inf
+++ /dev/null
@@ -1,5 +0,0 @@
-instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-docker-nightly,type:0); \
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-docker-nightly,type:1); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/linuxtools/updates-docker-nightly,type:0,name:Linux Tools Docker Tooling,enabled:false); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/linuxtools/updates-docker-nightly,type:1,name:Linux Tools Docker Tooling,enabled:false); 
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml b/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml
deleted file mode 100644
index 363fd0a959..0000000000
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright (C) 2014, 2018 Red Hat, Inc.
-
-   This program and the accompanying materials are made
-   available under the terms of the Eclipse Public License 2.0
-   which is available at https://www.eclipse.org/legal/epl-2.0/
-  
-   SPDX-License-Identifier: EPL-2.0
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-      <groupId>org.eclipse.linuxtools</groupId>
-      <artifactId>org.eclipse.linuxtools.docker</artifactId>
-      <version>5.16.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.linuxtools.docker.tests.feature</artifactId>
-  <version>5.16.0-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-
-  <name>Linux Tools Docker Tooling Test Feature</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>feature-source</id>
-            <phase>package</phase>
-            <goals>
-              <goal>feature-source</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <executions>
-          <execution>
-            <id>attach-p2-metadata</id>
-            <phase>package</phase>
-            <goals>
-              <goal>p2-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/containers/pom.xml b/containers/pom.xml
index 52a8bb9d36..b924714a7e 100644
--- a/containers/pom.xml
+++ b/containers/pom.xml
@@ -25,9 +25,8 @@
     <module>org.eclipse.linuxtools.docker.ui.tests</module>
     <module>org.eclipse.linuxtools.docker.docs</module>
     <module>org.eclipse.linuxtools.docker-feature</module>
-    <module>org.eclipse.linuxtools.docker.reddeer</module>
-    <module>org.eclipse.linuxtools.docker.integration.tests</module>
-    <module>org.eclipse.linuxtools.docker.tests-feature</module>
+    <!--module>org.eclipse.linuxtools.docker.reddeer</module>
+    <module>org.eclipse.linuxtools.docker.integration.tests</module-->
     <module>org.eclipse.linuxtools.docker.editor.ls</module>
     <module>org.eclipse.linuxtools.docker.editor.ls-feature</module>
     <module>org.eclipse.linuxtools.docker.editor.ls.tests</module>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.33.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.33.target
index 059bafd97b..57704f8e49 100644
--- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.33.target
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.33.target
@@ -68,11 +68,11 @@
 <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/technology/swtbot/releases/latest/"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<!--location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.reddeer.ui.feature.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/reddeer/releases/4.7.0/"/>
-</location>
+</location-->
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.0.0"/>