diff --git a/src/main/bash/selfupdate.sh b/src/main/bash/selfupdate.sh
index ef5e2dd7..ea1a2b15 100755
--- a/src/main/bash/selfupdate.sh
+++ b/src/main/bash/selfupdate.sh
@@ -87,12 +87,6 @@ for (( i=0; i <= ${#GVM_CANDIDATES}; i++ )); do
 	fi
 done
 
-if [[ -d "${GVM_DIR}/vert.x" && ! -d "${GVM_DIR}/vertx" ]]; then
-	mv "${GVM_DIR}/vert.x" "${GVM_DIR}/vertx"
-else
-	mkdir -p "${GVM_DIR}/vertx"
-fi
-
 if [[ -f "${GVM_DIR}/ext/config" ]]; then
 	gvm_echo_debug "Removing config from ext folder..."
 	rm -v "${GVM_DIR}/ext/config"
diff --git a/src/test/cucumber/gvm/self_update.feature b/src/test/cucumber/gvm/self_update.feature
index 38c5d57e..e52e89c0 100644
--- a/src/test/cucumber/gvm/self_update.feature
+++ b/src/test/cucumber/gvm/self_update.feature
@@ -31,16 +31,3 @@ Feature: Self Update
     When I enter "gvm selfupdate"
     Then the configuration file contains "gvm_auto_answer=true"
     And the configuration file contains "gvm_suggestive_selfupdate=true"
-
-  Scenario: Rename the vertx Candidate on Upgrade
-    Given the candidate "vert.x" version "1.3.0.final" is already installed and default
-    And the candidate "vertx" does not exist
-    When I enter "gvm selfupdate"
-    Then the candidate "vertx" version "1.3.0.final" is installed
-    And the candidate "vert.x" version "1.3.0.final" is not installed
-
-  Scenario: Ignore an already converted vertx Candidate on Upgrade
-    Given the candidate "vertx" version "1.3.0.final" is already installed and default
-    When I enter "gvm selfupdate"
-    Then the candidate "vertx" version "1.3.0.final" is installed
-    And the candidate "vert.x" version "1.3.0.final" is not installed