diff --git a/tests/kfdtest/src/XgmiOptimizedSDMAQueue.hpp b/tests/kfdtest/src/XgmiOptimizedSDMAQueue.hpp
new file mode 100644
index 0000000000..bbd719fed9
--- /dev/null
+++ b/tests/kfdtest/src/XgmiOptimizedSDMAQueue.hpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2014-2019 Advanced Micro Devices, Inc. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef __KFD_XGMI_OPTIMIZED_SDMA_QUEUE__H__
+#define __KFD_XGMI_OPTIMIZED_SDMA_QUEUE__H__
+
+#include "SDMAQueue.hpp"
+
+class XgmiOptimizedSDMAQueue : public SDMAQueue {
+ public:
+    XgmiOptimizedSDMAQueue(void) {CMD_NOP = 0;}
+    virtual ~XgmiOptimizedSDMAQueue(void) {}
+ protected:
+    virtual _HSA_QUEUE_TYPE GetQueueType() { return HSA_QUEUE_SDMA_XGMI; }
+};
+
+#endif  // __KFD_XGMI_OPTIMIZED_SDMA_QUEUE__H__