diff --git a/test/var/inferred/global-let.wgsl b/test/let/global/global.wgsl
similarity index 100%
rename from test/var/inferred/global-let.wgsl
rename to test/let/global/global.wgsl
diff --git a/test/var/inferred/global-let.wgsl.expected.hlsl b/test/let/global/global.wgsl.expected.hlsl
similarity index 100%
rename from test/var/inferred/global-let.wgsl.expected.hlsl
rename to test/let/global/global.wgsl.expected.hlsl
diff --git a/test/var/inferred/global-let.wgsl.expected.msl b/test/let/global/global.wgsl.expected.msl
similarity index 100%
rename from test/var/inferred/global-let.wgsl.expected.msl
rename to test/let/global/global.wgsl.expected.msl
diff --git a/test/var/inferred/global-let.wgsl.expected.spvasm b/test/let/global/global.wgsl.expected.spvasm
similarity index 100%
rename from test/var/inferred/global-let.wgsl.expected.spvasm
rename to test/let/global/global.wgsl.expected.spvasm
diff --git a/test/var/inferred/global-let.wgsl.expected.wgsl b/test/let/global/global.wgsl.expected.wgsl
similarity index 100%
rename from test/var/inferred/global-let.wgsl.expected.wgsl
rename to test/let/global/global.wgsl.expected.wgsl
diff --git a/test/var/inferred/function-let.wgsl b/test/let/inferred/function.wgsl
similarity index 100%
rename from test/var/inferred/function-let.wgsl
rename to test/let/inferred/function.wgsl
diff --git a/test/var/inferred/function-let.wgsl.expected.hlsl b/test/let/inferred/function.wgsl.expected.hlsl
similarity index 100%
rename from test/var/inferred/function-let.wgsl.expected.hlsl
rename to test/let/inferred/function.wgsl.expected.hlsl
diff --git a/test/var/inferred/function-let.wgsl.expected.msl b/test/let/inferred/function.wgsl.expected.msl
similarity index 100%
rename from test/var/inferred/function-let.wgsl.expected.msl
rename to test/let/inferred/function.wgsl.expected.msl
diff --git a/test/var/inferred/function-let.wgsl.expected.spvasm b/test/let/inferred/function.wgsl.expected.spvasm
similarity index 100%
rename from test/var/inferred/function-let.wgsl.expected.spvasm
rename to test/let/inferred/function.wgsl.expected.spvasm
diff --git a/test/var/inferred/function-let.wgsl.expected.wgsl b/test/let/inferred/function.wgsl.expected.wgsl
similarity index 100%
rename from test/var/inferred/function-let.wgsl.expected.wgsl
rename to test/let/inferred/function.wgsl.expected.wgsl
diff --git a/test/var/inferred/function-var.wgsl b/test/var/inferred/function.wgsl
similarity index 100%
rename from test/var/inferred/function-var.wgsl
rename to test/var/inferred/function.wgsl
diff --git a/test/var/inferred/function-var.wgsl.expected.hlsl b/test/var/inferred/function.wgsl.expected.hlsl
similarity index 100%
rename from test/var/inferred/function-var.wgsl.expected.hlsl
rename to test/var/inferred/function.wgsl.expected.hlsl
diff --git a/test/var/inferred/function-var.wgsl.expected.msl b/test/var/inferred/function.wgsl.expected.msl
similarity index 100%
rename from test/var/inferred/function-var.wgsl.expected.msl
rename to test/var/inferred/function.wgsl.expected.msl
diff --git a/test/var/inferred/function-var.wgsl.expected.spvasm b/test/var/inferred/function.wgsl.expected.spvasm
similarity index 100%
rename from test/var/inferred/function-var.wgsl.expected.spvasm
rename to test/var/inferred/function.wgsl.expected.spvasm
diff --git a/test/var/inferred/function-var.wgsl.expected.wgsl b/test/var/inferred/function.wgsl.expected.wgsl
similarity index 100%
rename from test/var/inferred/function-var.wgsl.expected.wgsl
rename to test/var/inferred/function.wgsl.expected.wgsl