diff --git a/hipamd/src/device_util.h b/hipamd/src/device_util.h
index e302b7db8a..ad8b2607dd 100644
--- a/hipamd/src/device_util.h
+++ b/hipamd/src/device_util.h
@@ -32,7 +32,7 @@ THE SOFTWARE.
 #define NUM_PAGES_PER_THREAD  16
 #define SIZE_OF_PAGE          64
 #define NUM_THREADS_PER_CU    64
-#define NUM_CUS_PER_GPU       64
+#define NUM_CUS_PER_GPU       64  // Specific for r9 Nano
 #define NUM_PAGES NUM_PAGES_PER_THREAD * NUM_THREADS_PER_CU * NUM_CUS_PER_GPU
 #define SIZE_MALLOC NUM_PAGES * SIZE_OF_PAGE
 #define SIZE_OF_HEAP SIZE_MALLOC
diff --git a/hipamd/tests/src/deviceLib/hipTestDeviceSymbol.cpp b/hipamd/tests/src/deviceLib/hipTestDeviceSymbol.cpp
index ed4d3902c5..49a719a8d4 100644
--- a/hipamd/tests/src/deviceLib/hipTestDeviceSymbol.cpp
+++ b/hipamd/tests/src/deviceLib/hipTestDeviceSymbol.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM all
+ * BUILD: %t %s 
  * RUN: %t
  * HIT_END
  */
diff --git a/hipamd/tests/src/kernel/hipTestConstant.cpp b/hipamd/tests/src/kernel/hipTestConstant.cpp
index 6d630f97ff..9aeaf59c00 100644
--- a/hipamd/tests/src/kernel/hipTestConstant.cpp
+++ b/hipamd/tests/src/kernel/hipTestConstant.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM all
+ * BUILD: %t %s ../test_common.cpp 
  * RUN: %t
  * HIT_END
  */