diff --git a/tests/xgldevice.cpp b/tests/xgldevice.cpp
index 1a15a53..8339de0 100644
--- a/tests/xgldevice.cpp
+++ b/tests/xgldevice.cpp
@@ -75,10 +75,11 @@
     }
 }
 
-void XglDevice::get_device_queue()
+
+void XglDevice::get_device_queue(XGL_QUEUE_TYPE queue_type, XGL_UINT queue_idx)
 {
     XGL_RESULT err;
 
-    err = xglGetDeviceQueue(this->device(), XGL_QUEUE_TYPE_GRAPHICS, 0, &this->m_queue);
+    err = xglGetDeviceQueue(this->device(), queue_type, queue_idx, &this->m_queue);
     ASSERT_XGL_SUCCESS(err) << "xglGetDeviceQueue failed";
 }
diff --git a/tests/xgldevice.h b/tests/xgldevice.h
index 9024ac0..764426c 100644
--- a/tests/xgldevice.h
+++ b/tests/xgldevice.h
@@ -11,7 +11,9 @@
     XGL_DEVICE device() {return this->m_xgl_device_object;}
     void init_formats();
     void init_device();
-    void get_device_queue();
+    void get_device_queue(XGL_QUEUE_TYPE queue_type,
+                          XGL_UINT queue_idx);
+    void get_device_queue() {get_device_queue();}
 
 private:
     XGL_DEVICE m_xgl_device_object;