diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index c079045..81b4fbe 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1209,9 +1209,11 @@
         memcpy((void*)&info.pStages[i], shaderCreateInfo, sizeof(VkPipelineShaderStageCreateInfo));
     }
 
-    if (m_vi_state.attributeCount && m_vi_state.bindingCount)
-    {
+    if (m_vi_state.attributeCount && m_vi_state.bindingCount) {
         m_vi_state.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
+        info.pVertexInputState = &m_vi_state;
+    } else {
+        info.pVertexInputState = NULL;
     }
 
     info.sType  = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
@@ -1225,7 +1227,6 @@
     info.renderPass        = render_pass;
     info.subpass           = 0;
     info.pTessellationState   = NULL;
-    info.pVertexInputState    = &m_vi_state;
     info.pInputAssemblyState  = &m_ia_state;
     info.pViewportState       = &m_vp_state;
     info.pRasterState         = &m_rs_state;
diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index c7876ca..c733552 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -593,7 +593,7 @@
 inline VkCmdPoolCreateInfo CmdPool::create_info(uint32_t queue_family_index)
 {
     VkCmdPoolCreateInfo info = {};
-    info.sType = VK_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO;
+    info.sType = VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO;
     info.queueFamilyIndex = queue_family_index;
     return info;
 }