diff --git a/.gitmodules b/.gitmodules
index 8125974f..49a3cf0a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "test_elasticsearch/rest-api-spec"]
-	path = test_elasticsearch/rest-api-spec
-	url = https://github.com/elasticsearch/elasticsearch-rest-api-spec.git
+[submodule "rest-api-spec"]
+	path = rest-api-spec
+	url = https://github.com/elasticsearch/elasticsearch.git
diff --git a/rest-api-spec b/rest-api-spec
new file mode 160000
index 00000000..08a077ff
--- /dev/null
+++ b/rest-api-spec
@@ -0,0 +1 @@
+Subproject commit 08a077ffae2654f9ec84e0ae881e87b18444c863
diff --git a/test_elasticsearch/rest-api-spec b/test_elasticsearch/rest-api-spec
deleted file mode 160000
index b3ab7248..00000000
--- a/test_elasticsearch/rest-api-spec
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b3ab72486fae1b5c5a5397356a3e113bf72eb6d5
diff --git a/test_elasticsearch/test_server/test_common.py b/test_elasticsearch/test_server/test_common.py
index a137b203..7435a574 100644
--- a/test_elasticsearch/test_server/test_common.py
+++ b/test_elasticsearch/test_server/test_common.py
@@ -191,9 +191,8 @@ def construct_case(filename, name):
 YAML_DIR = environ.get(
     'YAML_TEST_DIR',
     join(
-        dirname(__file__),
-        pardir, 
-        'rest-api-spec', 'test'
+        dirname(__file__), pardir, pardir,
+        'rest-api-spec', 'rest-api-spec', 'test'
     )
 )