diff --git a/.kokoro/functions/datastore.cfg b/.kokoro/datastore-functions.cfg
similarity index 89%
rename from .kokoro/functions/datastore.cfg
rename to .kokoro/datastore-functions.cfg
index ea77e8bcfe..a7b051cd38 100644
--- a/.kokoro/functions/datastore.cfg
+++ b/.kokoro/datastore-functions.cfg
@@ -3,7 +3,7 @@
 # Set the folder in which the tests are run
 env_vars: {
     key: "PROJECT"
-    value: "functions/datastore"
+    value: "datastore/functions"
 }
 
 # Tell the trampoline which build file to use.
diff --git a/functions/datastore/README.md b/datastore/functions/README.md
similarity index 100%
rename from functions/datastore/README.md
rename to datastore/functions/README.md
diff --git a/functions/datastore/index.js b/datastore/functions/index.js
similarity index 100%
rename from functions/datastore/index.js
rename to datastore/functions/index.js
diff --git a/functions/datastore/package.json b/datastore/functions/package.json
similarity index 100%
rename from functions/datastore/package.json
rename to datastore/functions/package.json
diff --git a/functions/datastore/test/.eslintrc.yml b/datastore/functions/test/.eslintrc.yml
similarity index 100%
rename from functions/datastore/test/.eslintrc.yml
rename to datastore/functions/test/.eslintrc.yml
diff --git a/functions/datastore/test/index.test.js b/datastore/functions/test/index.test.js
similarity index 100%
rename from functions/datastore/test/index.test.js
rename to datastore/functions/test/index.test.js
diff --git a/functions/README.md b/functions/README.md
index 4341ca27c3..548d87d3a2 100644
--- a/functions/README.md
+++ b/functions/README.md
@@ -22,7 +22,6 @@ environment.
 * [Hello World](helloworld/)
 * [Background](background/)
 * [Callbacks](messages/)
-* [Cloud Datastore](datastore/)
 * [Cloud Pub/Sub](pubsub/)
 * [Cloud Spanner](spanner/)
 * [Dependencies](uuid/)