4 files changed, 92 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index de503c10ad..c327e7f58a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /tests/phpbb_unit_tests.sqlite*
 /tests/test_config*.php
 /tests/tmp/*
+/tests/vendor
diff --git a/tests/composer.json b/tests/composer.json
new file mode 100644
index 0000000000..d92c8eec0e
--- /dev/null
+++ b/tests/composer.json
@@ -0,0 +1,24 @@
+{
+	"name": "phpbb/phpbb",
+	"description": "phpBB Forum Software application",
+	"type": "project",
+	"keywords": ["phpbb", "forum"],
+	"homepage": "https://www.phpbb.com",
+	"license": "GPL-2.0",
+	"authors": [
+		{
+			"name": "phpBB Limited",
+			"email": "operations@phpbb.com",
+			"homepage": "https://www.phpbb.com/go/authors"
+		}
+	],
+	"support": {
+		"issues": "https://tracker.phpbb.com",
+		"forum": "https://www.phpbb.com/community/",
+		"wiki": "https://wiki.phpbb.com",
+		"irc": "irc://irc.freenode.org/phpbb"
+	},
+	"require-dev": {
+		"facebook/webdriver": "dev-master"
+	}
+}
diff --git a/tests/composer.lock b/tests/composer.lock
new file mode 100644
index 0000000000..32d90d43fc
--- /dev/null
+++ b/tests/composer.lock
@@ -0,0 +1,66 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+    ],
+    "hash": "2affca245bd4946ca7acdf46f100af3c",
+    "packages": [
+
+    ],
+    "packages-dev": [
+        {
+            "name": "facebook/webdriver",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facebook/php-webdriver.git",
+                "reference": "b6e002e5bf811a8edba393ce6872322c1b7cf796"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/b6e002e5bf811a8edba393ce6872322c1b7cf796",
+                "reference": "b6e002e5bf811a8edba393ce6872322c1b7cf796",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.19"
+            },
+            "require-dev": {
+                "phpdocumentor/phpdocumentor": "2.*",
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "lib/"
+                ]
+            },
+            "notification-url": "http://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "A php client for WebDriver",
+            "homepage": "https://github.com/facebook/php-webdriver",
+            "keywords": [
+                "facebook",
+                "php",
+                "selenium",
+                "webdriver"
+            ],
+            "time": "2014-08-05 02:55:46"
+        }
+    ],
+    "aliases": [
+
+    ],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "facebook/webdriver": 20
+    },
+    "platform": [
+
+    ],
+    "platform-dev": [
+
+    ]
+}
diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php
index 451aad7e60..702b15d50a 100644
--- a/tests/test_framework/phpbb_ui_test_case.php
+++ b/tests/test_framework/phpbb_ui_test_case.php
@@ -10,7 +10,7 @@
 * the docs/CREDITS.txt file.
 *
 */
-require_once __DIR__ . '/../../phpBB/vendor/facebook/webdriver/lib/__init__.php';		
+require_once __DIR__ . '/../vendor/facebook/webdriver/lib/__init__.php';
 require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
 
 class phpbb_ui_test_case extends phpbb_test_case