diff --git a/docs/source/oauth2client.contrib.gce.rst b/docs/source/oauth2client.contrib.gce.rst
new file mode 100644
index 0000000..a3748b6
--- /dev/null
+++ b/docs/source/oauth2client.contrib.gce.rst
@@ -0,0 +1,7 @@
+oauth2client.contrib.gce module
+===============================
+
+.. automodule:: oauth2client.contrib.gce
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/source/oauth2client.contrib.rst b/docs/source/oauth2client.contrib.rst
index f90c16f..3fa160b 100644
--- a/docs/source/oauth2client.contrib.rst
+++ b/docs/source/oauth2client.contrib.rst
@@ -16,6 +16,7 @@ Submodules
    oauth2client.contrib.appengine
    oauth2client.contrib.django_orm
    oauth2client.contrib.flask_util
+   oauth2client.contrib.gce
    oauth2client.contrib.keyring_storage
    oauth2client.contrib.locked_file
    oauth2client.contrib.multistore_file
diff --git a/docs/source/oauth2client.gce.rst b/docs/source/oauth2client.gce.rst
deleted file mode 100644
index d25559f..0000000
--- a/docs/source/oauth2client.gce.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-oauth2client.gce module
-=======================
-
-.. automodule:: oauth2client.gce
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/docs/source/oauth2client.rst b/docs/source/oauth2client.rst
index 09ef81b..2089c64 100644
--- a/docs/source/oauth2client.rst
+++ b/docs/source/oauth2client.rst
@@ -18,7 +18,6 @@ Submodules
    oauth2client.crypt
    oauth2client.devshell
    oauth2client.file
-   oauth2client.gce
    oauth2client.service_account
    oauth2client.tools
    oauth2client.util
diff --git a/oauth2client/client.py b/oauth2client/client.py
index 20b4a0c..495631e 100644
--- a/oauth2client/client.py
+++ b/oauth2client/client.py
@@ -1499,13 +1499,13 @@ def _raise_exception_for_reading_json(credential_file,
 
 
 def _get_application_default_credential_GAE():
-    from oauth2client.appengine import AppAssertionCredentials
+    from oauth2client.contrib.appengine import AppAssertionCredentials
 
     return AppAssertionCredentials([])
 
 
 def _get_application_default_credential_GCE():
-    from oauth2client.gce import AppAssertionCredentials
+    from oauth2client.contrib.gce import AppAssertionCredentials
 
     return AppAssertionCredentials([])
 
diff --git a/oauth2client/gce.py b/oauth2client/contrib/gce.py
similarity index 100%
rename from oauth2client/gce.py
rename to oauth2client/contrib/gce.py
diff --git a/tests/test_gce.py b/tests/contrib/test_gce.py
similarity index 97%
rename from tests/test_gce.py
rename to tests/contrib/test_gce.py
index a12907b..4367e7f 100644
--- a/tests/test_gce.py
+++ b/tests/contrib/test_gce.py
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Tests for oauth2client.gce.
+"""Tests for oauth2client.contrib.gce.
 
-Unit tests for oauth2client.gce.
+Unit tests for oauth2client.contrib.gce.
 """
 
 import json
@@ -27,7 +27,7 @@ from oauth2client._helpers import _to_bytes
 from oauth2client.client import AccessTokenRefreshError
 from oauth2client.client import Credentials
 from oauth2client.client import save_to_well_known_file
-from oauth2client.gce import AppAssertionCredentials
+from oauth2client.contrib.gce import AppAssertionCredentials
 
 
 __author__ = 'jcgregorio@google.com (Joe Gregorio)'