diff --git a/unified/codeql-extractor.yml b/unified/codeql-extractor.yml
index 388566c09f11..8851d3520795 100644
--- a/unified/codeql-extractor.yml
+++ b/unified/codeql-extractor.yml
@@ -5,6 +5,8 @@ column_kind: "utf8"
 legacy_qltest_extraction: true
 build_modes:
   - none
+default_queries:
+  - codeql/unified-queries
 github_api_languages:
   - Swift
 scc_languages:
diff --git a/unified/ql/src/DummyQuery.ql b/unified/ql/src/DummyQuery.ql
new file mode 100644
index 000000000000..32890433c103
--- /dev/null
+++ b/unified/ql/src/DummyQuery.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Dummy query
+ * @description Dummy query that flags any name longer than 100 characters
+ * @kind problem
+ * @id unified/dummy
+ * @problem.severity error
+ * @precision high
+ * @security-severity 7
+ * @tags security
+ */
+
+import unified
+
+from Identifier id
+where id.getValue().length() > 100
+select id, "Name is too long: " + id.getValue()
diff --git a/unified/ql/src/codeql-suites/unified-code-quality-extended.qls b/unified/ql/src/codeql-suites/unified-code-quality-extended.qls
new file mode 100644
index 000000000000..1ee85cae856c
--- /dev/null
+++ b/unified/ql/src/codeql-suites/unified-code-quality-extended.qls
@@ -0,0 +1,3 @@
+- queries: .
+- apply: code-quality-extended-selectors.yml
+  from: codeql/suite-helpers
diff --git a/unified/ql/src/codeql-suites/unified-code-quality.qls b/unified/ql/src/codeql-suites/unified-code-quality.qls
new file mode 100644
index 000000000000..2074f9378cfd
--- /dev/null
+++ b/unified/ql/src/codeql-suites/unified-code-quality.qls
@@ -0,0 +1,3 @@
+- queries: .
+- apply: code-quality-selectors.yml
+  from: codeql/suite-helpers
diff --git a/unified/ql/src/codeql-suites/unified-code-scanning.qls b/unified/ql/src/codeql-suites/unified-code-scanning.qls
new file mode 100644
index 000000000000..2a46a1604c3d
--- /dev/null
+++ b/unified/ql/src/codeql-suites/unified-code-scanning.qls
@@ -0,0 +1,4 @@
+- description: Standard Code Scanning queries for Unified
+- queries: .
+- apply: code-scanning-selectors.yml
+  from: codeql/suite-helpers
diff --git a/unified/ql/src/codeql-suites/unified-security-and-quality.qls b/unified/ql/src/codeql-suites/unified-security-and-quality.qls
new file mode 100644
index 000000000000..255b6082c8bc
--- /dev/null
+++ b/unified/ql/src/codeql-suites/unified-security-and-quality.qls
@@ -0,0 +1,4 @@
+- description: Security-and-quality queries for Unified
+- queries: .
+- apply: security-and-quality-selectors.yml
+  from: codeql/suite-helpers
diff --git a/unified/ql/src/codeql-suites/unified-security-experimental.qls b/unified/ql/src/codeql-suites/unified-security-experimental.qls
new file mode 100644
index 000000000000..d94d4fcae6a6
--- /dev/null
+++ b/unified/ql/src/codeql-suites/unified-security-experimental.qls
@@ -0,0 +1,4 @@
+- description: Extended and experimental security queries for Unified
+- queries: .
+- apply: security-experimental-selectors.yml
+  from: codeql/suite-helpers
diff --git a/unified/ql/src/codeql-suites/unified-security-extended.qls b/unified/ql/src/codeql-suites/unified-security-extended.qls
new file mode 100644
index 000000000000..fc6446d8fed4
--- /dev/null
+++ b/unified/ql/src/codeql-suites/unified-security-extended.qls
@@ -0,0 +1,4 @@
+- description: Security-extended queries for Unified
+- queries: .
+- apply: security-extended-selectors.yml
+  from: codeql/suite-helpers