diff --git a/releng/CDT.setup b/releng/CDT.setup
index c2fb0396de3..0c642b44d1a 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -113,6 +113,8 @@
             name="org.apache.log4j.source"/>
         <requirement
             name="org.apache.commons.compress"/>
+        <requirement
+            name="org.assertj"/>
         <requirement
             name="net.sourceforge.lpg.lpgjavaruntime"/>
         <requirement
@@ -145,8 +147,12 @@
             name="org.eclipse.remote.serial.feature.group"/>
         <requirement
             name="org.eclipse.remote.console.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
         <requirement
             name="org.eclipse.tm.terminal.control"/>
+        <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
         <requirement
             name="org.eclipse.launchbar.feature.group"/>
         <requirement
@@ -171,6 +177,8 @@
             name="tm-feature.feature.group"/>
         <requirement
             name="org.eclipse.lsp4e"/>
+        <requirement
+            name="org.eclipse.epp.logging.aeri.feature.feature.group"/>
         <sourceLocator
             rootFolder="${git.clone.cdt.location}"
             locateNestedProjects="true"/>
@@ -194,6 +202,8 @@
               url="http://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
           <repository
               url="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.M7-20180510062228/repository"/>
+          <repository
+              url="http://download.eclipse.org/technology/epp/logging/stable/"/>
           <repository
               url="http://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
           <repository