diff --git a/src/test/container-features/containerFeaturesOrder.test.ts b/src/test/container-features/containerFeaturesOrder.test.ts
index 8426a0946..d4c880809 100644
--- a/src/test/container-features/containerFeaturesOrder.test.ts
+++ b/src/test/container-features/containerFeaturesOrder.test.ts
@@ -674,7 +674,8 @@ describe('Feature Dependencies', function () {
                 }
             });
 
-            assert.deepStrictEqual(actual.length, 3);
+            // The deprecated terraform shorthand resolves to terraform:1, which has github-cli as a hard dependency.
+            assert.deepStrictEqual(actual.length, 4);
             assert.deepStrictEqual(actual,
                 [
                     {
@@ -687,6 +688,12 @@ describe('Feature Dependencies', function () {
                             greeting: 'howdy'
                         }
                     },
+                    {
+                        id: 'ghcr.io/devcontainers/features/github-cli',
+                        options: {
+                            version: 'latest'
+                        }
+                    },
                     {
                         id: 'ghcr.io/devcontainers/features/terraform',
                         options: 'latest'
diff --git a/src/test/container-features/e2e.test.ts b/src/test/container-features/e2e.test.ts
index 7976b0c95..eb1b8791e 100644
--- a/src/test/container-features/e2e.test.ts
+++ b/src/test/container-features/e2e.test.ts
@@ -88,7 +88,8 @@ describe('Dev Container Features E2E (remote)', function () {
                 const response = JSON.parse(res.stdout);
                 console.log(res.stderr);
 
-                assert.strictEqual(response.featuresConfiguration?.featureSets.length, 3);
+                // The deprecated terraform shorthand resolves to terraform:1, which has github-cli as a hard dependency.
+                assert.strictEqual(response.featuresConfiguration?.featureSets.length, 4);
 
                 const dind = response?.featuresConfiguration.featureSets.find((f: FeatureSet) => f?.features[0]?.id === 'docker-in-docker');
                 assert.exists(dind);