diff --git a/tensorflow/python/client/device_lib_test.py b/tensorflow/python/client/device_lib_test.py
index 85a7f05a283..561ce09099b 100644
--- a/tensorflow/python/client/device_lib_test.py
+++ b/tensorflow/python/client/device_lib_test.py
@@ -32,7 +32,7 @@ class DeviceLibTest(test_util.TensorFlowTestCase):
     self.assertEqual(devices[0].device_type, "CPU")
 
     # GPU test
-    if test.is_built_with_cuda():
+    if test.is_gpu_available():
       self.assertGreater(len(devices), 1)
       self.assertTrue("GPU" in [d.device_type for d in devices])