diff --git a/ruby/ql/test/query-tests/security/cwe-078/CommandInjection.expected b/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected
similarity index 100%
rename from ruby/ql/test/query-tests/security/cwe-078/CommandInjection.expected
rename to ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.expected
diff --git a/ruby/ql/test/query-tests/security/cwe-078/CommandInjection.qlref b/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.qlref
similarity index 100%
rename from ruby/ql/test/query-tests/security/cwe-078/CommandInjection.qlref
rename to ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.qlref
diff --git a/ruby/ql/test/query-tests/security/cwe-078/CommandInjection.rb b/ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.rb
similarity index 100%
rename from ruby/ql/test/query-tests/security/cwe-078/CommandInjection.rb
rename to ruby/ql/test/query-tests/security/cwe-078/CommandInjection/CommandInjection.rb
diff --git a/ruby/ql/test/query-tests/security/cwe-078/KernelOpen.expected b/ruby/ql/test/query-tests/security/cwe-078/KernelOpen/KernelOpen.expected
similarity index 100%
rename from ruby/ql/test/query-tests/security/cwe-078/KernelOpen.expected
rename to ruby/ql/test/query-tests/security/cwe-078/KernelOpen/KernelOpen.expected
diff --git a/ruby/ql/test/query-tests/security/cwe-078/KernelOpen.qlref b/ruby/ql/test/query-tests/security/cwe-078/KernelOpen/KernelOpen.qlref
similarity index 100%
rename from ruby/ql/test/query-tests/security/cwe-078/KernelOpen.qlref
rename to ruby/ql/test/query-tests/security/cwe-078/KernelOpen/KernelOpen.qlref
diff --git a/ruby/ql/test/query-tests/security/cwe-078/KernelOpen.rb b/ruby/ql/test/query-tests/security/cwe-078/KernelOpen/KernelOpen.rb
similarity index 100%
rename from ruby/ql/test/query-tests/security/cwe-078/KernelOpen.rb
rename to ruby/ql/test/query-tests/security/cwe-078/KernelOpen/KernelOpen.rb