diff --git a/hipamd/include/hip/nvcc_detail/hip_texture.h b/hipamd/include/hip/nvcc_detail/hip_texture.h
index cdd939bc1b..388733e492 100644
--- a/hipamd/include/hip/nvcc_detail/hip_texture.h
+++ b/hipamd/include/hip/nvcc_detail/hip_texture.h
@@ -1,6 +1,6 @@
 #ifndef HIP_TEXTURE_H
 #define HIP_TEXTURE_H
 
-#include <cuda_texture.h>
+#include <texture_types.h>
 
 #endif
diff --git a/hipamd/tests/src/Functional/Negative/Device/hipDeviceGetAttribute.cpp b/hipamd/tests/src/Functional/Negative/Device/hipDeviceGetAttribute.cpp
index b901f660ca..fbe26814e7 100644
--- a/hipamd/tests/src/Functional/Negative/Device/hipDeviceGetAttribute.cpp
+++ b/hipamd/tests/src/Functional/Negative/Device/hipDeviceGetAttribute.cpp
@@ -7,15 +7,15 @@ int main()
     int pi;
     int attr = 0;
 //    hipDeviceAttribute_t attr = hipDeviceAttributeMaxThreadsPerBlock;
-    HIP_CHECK(hipDeviceGetAttribute(nullptr, hipDeviceAttribute_t(attr), 0), hipDeviceGetAttribute);
+    HIP_CHECK(hipDeviceGetAttribute(NULL, hipDeviceAttribute_t(attr), 0), hipDeviceGetAttribute);
     HIP_CHECK(hipDeviceGetAttribute(&pi, hipDeviceAttribute_t(attr), 0), hipDeviceGetAttribute);
     attr = -1;
-    HIP_CHECK(hipDeviceGetAttribute(nullptr, hipDeviceAttribute_t(attr), 0), hipDeviceGetAttribute);
+    HIP_CHECK(hipDeviceGetAttribute(NULL, hipDeviceAttribute_t(attr), 0), hipDeviceGetAttribute);
     HIP_CHECK(hipDeviceGetAttribute(&pi, hipDeviceAttribute_t(attr), 0), hipDeviceGetAttribute);
     attr = 0;
-    HIP_CHECK(hipDeviceGetAttribute(nullptr, hipDeviceAttribute_t(attr), -1), hipDeviceGetAttribute);
+    HIP_CHECK(hipDeviceGetAttribute(NULL, hipDeviceAttribute_t(attr), -1), hipDeviceGetAttribute);
     HIP_CHECK(hipDeviceGetAttribute(&pi, hipDeviceAttribute_t(attr), -1), hipDeviceGetAttribute);
     attr = -1;
-    HIP_CHECK(hipDeviceGetAttribute(nullptr, hipDeviceAttribute_t(attr), -1), hipDeviceGetAttribute);
+    HIP_CHECK(hipDeviceGetAttribute(NULL, hipDeviceAttribute_t(attr), -1), hipDeviceGetAttribute);
     HIP_CHECK(hipDeviceGetAttribute(&pi, hipDeviceAttribute_t(attr), -1), hipDeviceGetAttribute);
 }
diff --git a/hipamd/tests/src/nvcc/Device/hipDeviceGetSharedMemConfig.cpp b/hipamd/tests/src/nvcc/Device/hipDeviceGetSharedMemConfig.cpp
new file mode 100644
index 0000000000..ce447aa828
--- /dev/null
+++ b/hipamd/tests/src/nvcc/Device/hipDeviceGetSharedMemConfig.cpp
@@ -0,0 +1,28 @@
+/*
+Copyright (c) 2015-2016 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.
+*/
+
+#include<hip/hip_runtime_api.h>
+#include"test_common.h"
+
+int main()
+{
+    hipSharedMemConfig_t config;
+    HIP_PRINT_STATUS(hipDeviceGetSharedMemConfig(NULL));
+    HIP_PRINT_STATUS(hipDeviceGetSharedMemConfig(&config));
+}