diff --git a/.gitignore b/.gitignore
index 0836c7c..206a30d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,7 @@ RoboFile.ini
 tests/acceptance.suite.yml
 tests/*/*Tester.php
 tests/_support/_generated/*TesterActions.php
-tests/joomla-cms3*
+tests/joomla*
 tests/_output*
 selenium-server-standalone.jar
 codecept.phar
diff --git a/RoboFile.dist.ini b/RoboFile.dist.ini
index b367398..bca9b64 100644
--- a/RoboFile.dist.ini
+++ b/RoboFile.dist.ini
@@ -4,7 +4,7 @@ skipClone = false
 
 ; If you want to setup your test website in a different folder, you can do that here.
 ; You can also set an absolute path, i.e. /path/to/my/cms/folder
-cmsPath = tests/joomla-cms3
+cmsPath = tests/joomla
 
 ; If you want to clone a different branch, you can set it here
 branch = staging
diff --git a/RoboFile.php b/RoboFile.php
index 64b89dc..810279a 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -331,8 +331,8 @@ class RoboFile extends \Robo\Tasks
 		// Optionally uses Joomla default htaccess file. Used by TravisCI
 		if ($use_htaccess == true)
 		{
-			$this->_copy('./tests/joomla-cms3/htaccess.txt', './tests/joomla-cms3/.htaccess');
-			$this->_exec('sed -e "s,# RewriteBase /,RewriteBase /tests/joomla-cms3/,g" -in-place tests/joomla-cms3/.htaccess');
+			$this->_copy('./tests/joomla/htaccess.txt', './tests/joomla/.htaccess');
+			$this->_exec('sed -e "s,# RewriteBase /,RewriteBase /tests/joomla/,g" -in-place tests/joomla/.htaccess');
 		}
 	}
 
@@ -392,13 +392,13 @@ class RoboFile extends \Robo\Tasks
 	{
 		if (empty($this->configuration->cmsPath))
 		{
-			return 'tests/joomla-cms3';
+			return 'tests/joomla';
 		}
 
 		if (!file_exists(dirname($this->configuration->cmsPath)))
 		{
 			$this->say("Cms path written in local configuration does not exists or is not readable");
-			return 'tests/joomla-cms3';
+			return 'tests/joomla';
 		}
 
 		return $this->configuration->cmsPath;
diff --git a/composer.json b/composer.json
index ae6f781..a9d277d 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,11 @@
     "require-dev": {
         "codeception/codeception": "^2.2",
         "joomla-projects/joomla-browser": "v3.6.0.1",
-        "codegyre/robo": "~0.6",
-        "joomla-projects/robo": "dev-master",
+        "composition/robo": "~1",
+        "joomla-projects/robo": "~0",
         "joomla-projects/selenium-server-standalone": "v2.53.1",
         "fzaninotto/faker": "^1.6",
-        "joomla-projects/jorobo": "0.4",
+        "joomla-projects/jorobo": "~0.6",
         "Behat/Gherkin": "^4.4.1"
     }
 }
diff --git a/tests/acceptance.suite.dist.yml b/tests/acceptance.suite.dist.yml
index 2aead16..456242c 100644
--- a/tests/acceptance.suite.dist.yml
+++ b/tests/acceptance.suite.dist.yml
@@ -18,7 +18,7 @@ modules:
         - AcceptanceHelper
     config:
         JoomlaBrowser:
-            url: 'http://localhost/tests/joomla-cms3'     # the url that points to the joomla installation at /tests/system/joomla-cms
+            url: 'http://localhost/tests/joomla'     # the url that points to the joomla installation at /tests/system/joomla-cms
             browser: 'firefox'
             window_size: 1024x768
             capabilities:
@@ -37,8 +37,8 @@ modules:
             language: 'English (United Kingdom)'   # Language in which you want the Application to be Installed
         AcceptanceHelper:
             repo_folder: '/home/travis/build/joomla-extensions/weblinks/' # Path to the Extension repository. To be used by tests to install via Install from folder
-            counter_test_url: 'http://localhost/tests/joomla-cms3' # the url for the weblink item used to test hits counter
-            url: 'http://localhost/tests/joomla-cms3' # the url that points to the joomla installation at /tests/system/joomla-cms - we need it twice here
+            counter_test_url: 'http://localhost/tests/joomla' # the url for the weblink item used to test hits counter
+            url: 'http://localhost/tests/joomla' # the url that points to the joomla installation at /tests/system/joomla-cms - we need it twice here
 error_level: "E_ALL & ~E_STRICT & ~E_DEPRECATED"
 env:
     desktop: ~