diff --git a/providers/base/units/graphics/jobs.pxu b/providers/base/units/graphics/jobs.pxu
index 7180d31817..13fe4ccf2a 100644
--- a/providers/base/units/graphics/jobs.pxu
+++ b/providers/base/units/graphics/jobs.pxu
@@ -398,16 +398,46 @@ verification:
     1. Did the 3D animation appear?
     2. Was the animation free from slowness/jerkiness?
 
+plugin: shell
+category_id: com.canonical.plainbox::graphics
+id: graphics/auto_glxgears
+flags: also-after-suspend
+user: root
+requires:
+    executable.name == 'glxgears'
+    dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower','Space-saving']
+command:
+    prime_offload_tester.py -c glxgears -t 30
+summary:
+    Test that glxgears works for current video card
+purpose:
+     Tests the basic 3D capabilities of your current video card. This test covers all devices without an integrated display, such as desktops.
+
+plugin: shell
+category_id: com.canonical.plainbox::graphics
+id: graphics/auto_glxgears_fullscreen
+flags: also-after-suspend
+user: root
+requires:
+    executable.name == 'glxgears'
+    dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower','Space-saving']
+command:
+     prime_offload_tester.py -c "glxgears -fullscreen" -t 30
+summary:
+    Test that glxgears works in full screen mode for current video card
+purpose:
+     Tests the basic full screen 3D capabilities of your current video card. This test covers all devices without an integrated display, such as desktops.
+
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::graphics
 id: graphics/valid_glxgears
 flags: also-after-suspend
+user: root
 requires:
     executable.name == 'glxgears'
     dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower','Space-saving']
 command:
- glxgears
- true
+    prime_offload_tester.py -c glxgears -t 30
 summary:
     Test that glxgears works for current video card
 purpose:
@@ -423,12 +453,12 @@ plugin: user-interact-verify
 category_id: com.canonical.plainbox::graphics
 id: graphics/valid_glxgears_fullscreen
 flags: also-after-suspend
+user: root
 requires:
     executable.name == 'glxgears'
     dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower','Space-saving']
 command:
- glxgears -fullscreen
- true
+    prime_offload_tester.py -c "glxgears -fullscreen" -t 30
 summary:
     Test that glxgears works in full screen mode for current video card
 purpose:
diff --git a/providers/base/units/graphics/test-plan.pxu b/providers/base/units/graphics/test-plan.pxu
index 8ace0f0b0d..72a7c4b543 100644
--- a/providers/base/units/graphics/test-plan.pxu
+++ b/providers/base/units/graphics/test-plan.pxu
@@ -24,6 +24,8 @@ include:
  graphics/2_minimum_resolution_.*
  graphics/1_auto_glxgears_.*                    certification-status=blocker
  graphics/2_auto_glxgears_.*                    certification-status=blocker
+ graphics/auto_glxgears                         certification-status=blocker
+ graphics/auto_glxgears_fullscreen              certification-status=blocker
  suspend/resolution_before_suspend              certification-status=blocker
 bootstrap_include:
     graphics_card
@@ -68,6 +70,8 @@ include:
  after-suspend-graphics/1_minimum_resolution_.*
  after-suspend-graphics/1_auto_glxgears_.*                certification-status=blocker
  after-suspend-graphics/2_auto_glxgears_.*                certification-status=blocker
+ after-suspend-graphics/auto_glxgears                     certification-status=blocker
+ after-suspend-graphics/auto_glxgears_fullscreen          certification-status=blocker
  suspend/resolution_after_suspend                         certification-status=blocker
 
 id: after-suspend-graphics-gpu-cert-manual