diff --git a/gubernator/config.yaml b/gubernator/config.yaml
index 669188da061a..2ba36dae9108 100644
--- a/gubernator/config.yaml
+++ b/gubernator/config.yaml
@@ -26,7 +26,7 @@ jobs:
   - pull-kubernetes-bazel-build
   - pull-kubernetes-bazel-test
   - pull-kubernetes-e2e-gce
-  - pull-kubernetes-e2e-gce-gpu
+  - pull-kubernetes-e2e-gce-device-plugin-gpu
   - pull-kubernetes-e2e-kops-aws
   - pull-kubernetes-kubemark-e2e-gce
   - pull-kubernetes-node-e2e
diff --git a/jobs/config.json b/jobs/config.json
index 4f4ccafcd37e..3bee3b044900 100644
--- a/jobs/config.json
+++ b/jobs/config.json
@@ -10031,21 +10031,21 @@
       "UNKNOWN"
     ]
   },
-  "pull-kubernetes-e2e-gce-gpu": {
+  "pull-kubernetes-e2e-gce-device-plugin-gpu": {
     "args": [
       "--build=bazel",
       "--cluster=",
       "--env-file=jobs/platform/gce.env",
       "--env-file=jobs/env/pull-kubernetes-e2e.env",
-      "--env-file=jobs/env/pull-kubernetes-e2e-gce-gpu.env",
+      "--env-file=jobs/env/pull-kubernetes-e2e-gce-device-plugin-gpu.env",
       "--extract=local",
       "--gcp-node-image=gci",
       "--gcp-project=k8s-jkns-pr-gce-gpus",
       "--gcp-zone=us-west1-b",
       "--ginkgo-parallel=30",
       "--provider=gce",
-      "--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-gce-gpu",
-      "--test_args=--ginkgo.focus=\\[Feature:GPU\\] --minStartupPods=8",
+      "--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-gce-device-plugin-gpu",
+      "--test_args=--ginkgo.focus=\\[Feature:GPUDevicePlugin\\] --minStartupPods=8",
       "--timeout=60m"
     ],
     "scenario": "kubernetes_e2e",
diff --git a/jobs/env/pull-kubernetes-e2e-gce-gpu.env b/jobs/env/pull-kubernetes-e2e-gce-device-plugin-gpu.env
similarity index 69%
rename from jobs/env/pull-kubernetes-e2e-gce-gpu.env
rename to jobs/env/pull-kubernetes-e2e-gce-device-plugin-gpu.env
index e7270f182583..0ef70be6ae7f 100644
--- a/jobs/env/pull-kubernetes-e2e-gce-gpu.env
+++ b/jobs/env/pull-kubernetes-e2e-gce-device-plugin-gpu.env
@@ -1,4 +1,4 @@
 ### job-env
-KUBE_FEATURE_GATES=Accelerators=true
+KUBE_FEATURE_GATES=DevicePlugins=true
 NODE_ACCELERATORS=type=nvidia-tesla-k80,count=2
 CREATE_CUSTOM_NETWORK=true
diff --git a/prow/config.yaml b/prow/config.yaml
index 2661d4591ae1..8bd6ab7ec95c 100644
--- a/prow/config.yaml
+++ b/prow/config.yaml
@@ -835,18 +835,19 @@ presubmits:
     branches:
     - release-1.6
 
-  - name: pull-kubernetes-e2e-gce-gpu
+  - name: pull-kubernetes-e2e-gce-device-plugin-gpu
     agent: kubernetes
     skip_branches:
     - release-1.4
     - release-1.5
     - release-1.6
+    - release-1.7
     always_run: true
     skip_report: false
     max_concurrency: 12
-    context: pull-kubernetes-e2e-gce-gpu
-    rerun_command: "/test pull-kubernetes-e2e-gce-gpu"
-    trigger: "(?m)^/test( all| pull-kubernetes-e2e-gce-gpu),?(\\s+|$)"
+    context: pull-kubernetes-e2e-gce-device-plugin-gpu
+    rerun_command: "/test pull-kubernetes-e2e-gce-device-plugin-gpu"
+    trigger: "(?m)^/test( all| pull-kubernetes-e2e-gce-device-plugin-gpu),?(\\s+|$)"
     spec:
       containers:
       - image: gcr.io/k8s-testimages/kubekins-e2e:v20171018-fb8014bc-master
@@ -2037,18 +2038,19 @@ presubmits:
     always_run: true
     branches:
     - release-1.6
-  - name: pull-security-kubernetes-e2e-gce-gpu
+  - name: pull-security-kubernetes-e2e-gce-device-plugin-gpu
     agent: kubernetes
     skip_branches:
     - release-1.4
     - release-1.5
     - release-1.6
+    - release-1.7
     always_run: true
     skip_report: false
     max_concurrency: 12
-    context: pull-security-kubernetes-e2e-gce-gpu
-    rerun_command: "/test pull-security-kubernetes-e2e-gce-gpu"
-    trigger: "(?m)^/test( all| pull-security-kubernetes-e2e-gce-gpu),?(\\s+|$)"
+    context: pull-security-kubernetes-e2e-gce-device-plugin-gpu
+    rerun_command: "/test pull-security-kubernetes-e2e-gce-device-plugin-gpu"
+    trigger: "(?m)^/test( all| pull-security-kubernetes-e2e-gce-device-plugin-gpu),?(\\s+|$)"
     spec:
       containers:
       - image: gcr.io/k8s-testimages/kubekins-e2e:v20171018-fb8014bc-master
diff --git a/testgrid/config/config.yaml b/testgrid/config/config.yaml
index d876e9a6cc3c..049441ee9db2 100644
--- a/testgrid/config/config.yaml
+++ b/testgrid/config/config.yaml
@@ -1551,8 +1551,8 @@ test_groups:
   num_columns_recent: 20
   alert_stale_results_hours: 24
   num_failures_to_alert: 10
-- name: pull-kubernetes-e2e-gce-gpu
-  gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-kubernetes-e2e-gce-gpu
+- name: pull-kubernetes-e2e-gce-device-plugin-gpu
+  gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-kubernetes-e2e-gce-device-plugin-gpu
   days_of_results: 1
   num_columns_recent: 20
 - name: pull-kubernetes-e2e-gke-device-plugin-gpu
@@ -3949,8 +3949,8 @@ dashboards:
     base_options: 'width=10'
     alert_options:
       alert_mail_to_addresses: 'michelle.192837+alerts@gmail.com, lusensjtu+alerts@gmail.com, bentheelder+alerts@google.com'
-  - name: pull-kubernetes-e2e-gce-gpu
-    test_group_name: pull-kubernetes-e2e-gce-gpu
+  - name: pull-kubernetes-e2e-gce-device-plugin-gpu
+    test_group_name: pull-kubernetes-e2e-gce-device-plugin-gpu
     base_options: 'width=10'
   - name: pull-kubernetes-e2e-gke-device-plugin-gpu
     test_group_name: pull-kubernetes-e2e-gke-device-plugin-gpu