diff --git a/tests/Advanced/unbounded-arrays-srg-layout.py b/tests/Advanced/unbounded-arrays-srg-layout.py
index 5bb9b2f..448a688 100644
--- a/tests/Advanced/unbounded-arrays-srg-layout.py
+++ b/tests/Advanced/unbounded-arrays-srg-layout.py
@@ -38,10 +38,12 @@ def verify(thefile, compilerPath, silent):
         predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForImageViews"][0]["count"]  ==  1)
         predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForImageViews"][1]["index"]  ==  1)
         predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForImageViews"][1]["count"]  == -1)
+        predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForImageViews"][1]["bindless"] == False)
         predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForImageViews"][2]["index"]  ==  0)
         predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForImageViews"][2]["count"]  ==  1)
         predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForImageViews"][3]["index"]  ==  1)
         predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForImageViews"][3]["count"]  == -1)
+        predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForImageViews"][3]["bindless"] == False)
 
         predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForSamplers"][0]["index"]    ==  0)
         predicates.append(lambda: j["ShaderResourceGroups"][0]["inputsForSamplers"][0]["count"]    ==  1)
@@ -58,11 +60,13 @@ def verify(thefile, compilerPath, silent):
         predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForBufferViews"][0]["count"] ==  1)
         predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForBufferViews"][1]["index"] ==  2)
         predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForBufferViews"][1]["count"] == -1)
+        predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForBufferViews"][1]["bindless"] == True)
 
         predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForImageViews"][0]["index"]  ==  0)
         predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForImageViews"][0]["count"]  ==  1)
         predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForImageViews"][1]["index"]  ==  1)
         predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForImageViews"][1]["count"]  == -1)
+        predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForImageViews"][1]["bindless"] == True)
         predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForImageViews"][2]["index"]  ==  0)
         predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForImageViews"][2]["count"]  ==  1)
         predicates.append(lambda: j["ShaderResourceGroups"][1]["inputsForImageViews"][3]["index"]  ==  1)
diff --git a/tests/Samples/Bindless.txt b/tests/Samples/Bindless.txt
deleted file mode 100644
index 5334a84..0000000
--- a/tests/Samples/Bindless.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Srg layout produced with azslc.exe Bindless.azsl --srg
-"\"bindless\": true"
diff --git a/tests/Samples/UnboundedArrays.azsl_manual b/tests/Samples/UnboundedArrays.azsl_manual
index a913ec3..c59ea36 100644
--- a/tests/Samples/UnboundedArrays.azsl_manual
+++ b/tests/Samples/UnboundedArrays.azsl_manual
@@ -43,14 +43,14 @@ ShaderResourceGroup SRG2 : slot2
     int m_index; // Triggers usage of b0.
     uint2 m_rwTexCoord;
 
-    Texture2D<float4>        m_texSRVa;        // Takes t0, space0
-    Texture2D<float4>        m_texSRVb[];      // Takes t1+, space0
-    RWTexture2D<float4>      m_texUAVa;        // Takes u0, space0
-    RWTexture2D<float4>      m_texUAVb[];      // Takes u1+, space0
-    Sampler                  m_samplera;       // Takes s0, space0
-    Sampler                  m_samplerb[];     // Takes s1+, space0
-    ConstantBuffer<MyStruct> m_structArraya;   // Takes b1, space0
-    ConstantBuffer<MyStruct> m_structArrayb[]; // Takes b2+, space0 
+               Texture2D<float4>        m_texSRVa;        // Takes t0, space0
+    [bindless] Texture2D<float4>        m_texSRVb[];      // Takes t1+, space0
+               RWTexture2D<float4>      m_texUAVa;        // Takes u0, space0
+               RWTexture2D<float4>      m_texUAVb[];      // Takes u1+, space0
+               Sampler                  m_samplera;       // Takes s0, space0
+               Sampler                  m_samplerb[];     // Takes s1+, space0
+               ConstantBuffer<MyStruct> m_structArraya;   // Takes b1, space0
+    [bindless] ConstantBuffer<MyStruct> m_structArrayb[]; // Takes b2+, space0 
 }
 
 float4 MainPS(float2 uv : TEXCOORD0) : SV_Target0