diff --git a/bin/hardening/2.2.18_disable_telnet_server.sh b/bin/hardening/2.2.18_disable_telnet_server.sh
new file mode 100755
index 0000000..4754490
--- /dev/null
+++ b/bin/hardening/2.2.18_disable_telnet_server.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+#
+# Legacy CIS Debian Hardening
+#
+
+#
+# 2.2.18 Ensure telnet server is not enabled (Scored)
+#
+
+# Note: this check is not anymore in CIS hardening but we decided to keep it anyway
+
+set -e # One error, it's over
+set -u # One variable unset, it's over
+
+HARDENING_LEVEL=2
+DESCRIPTION="Ensure telnet server is not enabled. Recommended alternative : sshd (OpenSSH-server)."
+
+# Based on  aptitude search '~Ptelnet-server'
+PACKAGES='telnetd inetutils-telnetd telnetd-ssl krb5-telnetd heimdal-servers'
+FILE='/etc/inetd.conf'
+PATTERN='^telnet'
+
+# This function will be called if the script status is on enabled / audit mode
+audit () {
+    for PACKAGE in $PACKAGES; do
+        is_pkg_installed $PACKAGE
+        if [ $FNRET = 0 ]; then
+            warn "$PACKAGE is installed, checking configuration"
+            does_file_exist $FILE
+            if [ $FNRET != 0 ]; then
+                ok "$FILE does not exist"
+            else
+                does_pattern_exist_in_file $FILE $PATTERN
+                if [ $FNRET = 0 ]; then
+                    crit "$PATTERN exists, $PACKAGE services are enabled!"
+                else
+                    ok "$PATTERN is not present in $FILE"
+                fi
+            fi
+        else
+            ok "$PACKAGE is absent"
+        fi
+    done
+}
+
+# This function will be called if the script status is on enabled mode
+apply () {
+    for PACKAGE in $PACKAGES; do
+        is_pkg_installed $PACKAGE
+        if [ $FNRET = 0 ]; then
+            crit "$PACKAGE is installed, purging it"
+            apt-get purge $PACKAGE -y
+            apt-get autoremove
+        else
+            ok "$PACKAGE is absent"
+        fi
+        does_file_exist $FILE
+        if [ $FNRET != 0 ]; then
+            ok "$FILE does not exist"
+        else
+            info "$FILE exists, checking patterns"
+            does_pattern_exist_in_file $FILE $PATTERN
+            if [ $FNRET = 0 ]; then
+                warn "$PATTERN is present in $FILE, purging it"
+                backup_file $FILE
+                ESCAPED_PATTERN=$(sed "s/|\|(\|)/\\\&/g" <<< $PATTERN)
+                sed -ie "s/$ESCAPED_PATTERN/#&/g" $FILE
+            else
+                ok "$PATTERN is not present in $FILE"
+            fi
+        fi
+    done
+}
+
+# This function will check config parameters required
+check_config() {
+    :
+}
+
+# Source Root Dir Parameter
+if [ -r /etc/default/cis-hardening ]; then
+    . /etc/default/cis-hardening
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
+    exit 128
+fi
+
+# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi
diff --git a/bin/hardening/2.3.4_telnet_client_not_installed.sh b/bin/hardening/2.3.4_disable_telnet_client.sh
similarity index 96%
rename from bin/hardening/2.3.4_telnet_client_not_installed.sh
rename to bin/hardening/2.3.4_disable_telnet_client.sh
index d6336b4..a8a4dc6 100755
--- a/bin/hardening/2.3.4_telnet_client_not_installed.sh
+++ b/bin/hardening/2.3.4_disable_telnet_client.sh
@@ -12,7 +12,7 @@ set -e # One error, it's over
 set -u # One variable unset, it's over
 
 HARDENING_LEVEL=2
-DESCRIPTION="Ensure talk client is not installed."
+DESCRIPTION="Ensure telnet client is not installed."
 
 PACKAGES='telnet'
 
diff --git a/bin/hardening/2.3.5_ldap_client_not_installed.sh b/bin/hardening/2.3.5_disable_ldap_client.sh
similarity index 96%
rename from bin/hardening/2.3.5_ldap_client_not_installed.sh
rename to bin/hardening/2.3.5_disable_ldap_client.sh
index e2c7b94..ecda05d 100755
--- a/bin/hardening/2.3.5_ldap_client_not_installed.sh
+++ b/bin/hardening/2.3.5_disable_ldap_client.sh
@@ -12,7 +12,7 @@ set -e # One error, it's over
 set -u # One variable unset, it's over
 
 HARDENING_LEVEL=2
-DESCRIPTION="Ensure talk client is not installed."
+DESCRIPTION="Ensure ldap client is not installed."
 
 PACKAGES='ldap-utils'
 
diff --git a/tests/hardening/2.3.4_telnet_client_not_installed.sh b/tests/hardening/2.2.18_disable_telnet_server.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tests/hardening/2.3.4_telnet_client_not_installed.sh
rename to tests/hardening/2.2.18_disable_telnet_server.sh
diff --git a/tests/hardening/2.3.5_ldap_client_not_installed.sh b/tests/hardening/2.3.4_disable_telnet_client.sh
similarity index 100%
rename from tests/hardening/2.3.5_ldap_client_not_installed.sh
rename to tests/hardening/2.3.4_disable_telnet_client.sh
diff --git a/tests/hardening/2.3.5_disable_ldap_client.sh b/tests/hardening/2.3.5_disable_ldap_client.sh
new file mode 100644
index 0000000..b333419
--- /dev/null
+++ b/tests/hardening/2.3.5_disable_ldap_client.sh
@@ -0,0 +1,10 @@
+# run-shellcheck
+test_audit() {
+    describe Running on blank host
+    register_test retvalshouldbe 0
+    dismiss_count_for_test
+    # shellcheck disable=2154
+    run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
+
+    # TODO fill comprehensive tests
+}