diff --git a/hipamd/include/hip/hcc_detail/hip_runtime_api.h b/hipamd/include/hip/hcc_detail/hip_runtime_api.h
index 6fb7c0256e..a8db84c4f2 100644
--- a/hipamd/include/hip/hcc_detail/hip_runtime_api.h
+++ b/hipamd/include/hip/hcc_detail/hip_runtime_api.h
@@ -136,6 +136,31 @@ enum hipLimit_t
 #define hipDeviceLmemResizeToMax    0x16
 
 
+/*
+* @brief hipJitOption
+* @enum
+* @ingroup Enumerations
+*/
+typedef enum hipJitOption {
+  hipJitOptionMaxRegisters = 0,
+  hipJitOptionThreadsPerBlock,
+  hipJitOptionWallTime,
+  hipJitOptionInfoLogBuffer,
+  hipJitOptionInfoLogBufferSizeBytes,
+  hipJitOptionErrorLogBuffer,
+  hipJitOptionErrorLogBufferSizeBytes,
+  hipJitOptionOptimizationLevel,
+  hipJitOptionTargetFromContext,
+  hipJitOptionTarget,
+  hipJitOptionFallbackStrategy,
+  hipJitOptionGenerateDebugInfo,
+  hipJitOptionLogVerbose,
+  hipJitOptionGenerateLineInfo,
+  hipJitOptionCacheMode,
+  hipJitOptionNumOptions
+} hipJitOption;
+
+
 /**
  * @warning On AMD devices and recent Nvidia devices, these hints and controls are ignored.
  */
diff --git a/hipamd/include/hip/hip_runtime_api.h b/hipamd/include/hip/hip_runtime_api.h
index fa54dda5dc..dc163d5c25 100644
--- a/hipamd/include/hip/hip_runtime_api.h
+++ b/hipamd/include/hip/hip_runtime_api.h
@@ -250,29 +250,6 @@ typedef enum hipDeviceAttribute_t {
     hipDeviceAttributeIsMultiGpuBoard,                      ///< Multiple GPU devices.
 } hipDeviceAttribute_t;
 
-/*
-* @brief hipJitOption
-* @enum
-* @ingroup Enumerations
-*/
-typedef enum hipJitOption {
-  hipJitOptionMaxRegisters = 0,
-  hipJitOptionThreadsPerBlock,
-  hipJitOptionWallTime,
-  hipJitOptionInfoLogBuffer,
-  hipJitOptionInfoLogBufferSizeBytes,
-  hipJitOptionErrorLogBuffer,
-  hipJitOptionErrorLogBufferSizeBytes,
-  hipJitOptionOptimizationLevel,
-  hipJitOptionTargetFromContext,
-  hipJitOptionTarget,
-  hipJitOptionFallbackStrategy,
-  hipJitOptionGenerateDebugInfo,
-  hipJitOptionLogVerbose,
-  hipJitOptionGenerateLineInfo,
-  hipJitOptionCacheMode,
-  hipJitOptionNumOptions
-} hipJitOption;
 
 /**
  *     @}
diff --git a/hipamd/tests/src/runtimeApi/stream/hipNullStream.cpp b/hipamd/tests/src/runtimeApi/stream/hipNullStream.cpp
index 380979f6bc..b610315608 100644
--- a/hipamd/tests/src/runtimeApi/stream/hipNullStream.cpp
+++ b/hipamd/tests/src/runtimeApi/stream/hipNullStream.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
  * RUN: %t
  * HIT_END
  */
diff --git a/hipamd/tests/src/runtimeApi/stream/hipStreamWaitEvent.cpp b/hipamd/tests/src/runtimeApi/stream/hipStreamWaitEvent.cpp
index d12b07289b..9bbd43828c 100644
--- a/hipamd/tests/src/runtimeApi/stream/hipStreamWaitEvent.cpp
+++ b/hipamd/tests/src/runtimeApi/stream/hipStreamWaitEvent.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
  * RUN: %t
  * HIT_END
  */
diff --git a/hipamd/tests/src/test_common.h b/hipamd/tests/src/test_common.h
index bb44c94745..81edca4e1e 100644
--- a/hipamd/tests/src/test_common.h
+++ b/hipamd/tests/src/test_common.h
@@ -249,7 +249,7 @@ void initArraysForHost(T **A_h, T **B_h, T **C_h,
         }
     }
 
-    setDefaultData(N, A_h ? *A_h : nullptr, B_h ? *B_h : nullptr, C_h ? *C_h : nullptr);
+    setDefaultData(N, A_h ? *A_h : NULL, B_h ? *B_h : NULL, C_h ? *C_h : NULL);
 }