diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fa18d38dc81..6c9bcba59f5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -534,6 +534,7 @@ Unlike the user setting overrides, not all of these environment variables have t
 -   `AWS_TOOLKIT_TEST_NO_COLOR`: If the tests should include colour in their output
 -   `DEVELOPMENT_PATH`: The path to the aws toolkit vscode project
 -   `TEST_DIR` - The directory where the test runner should find the tests
+-   `AMAZONQ_FEATUREDEV_ITERATION_TEST` - Controls whether to enable multiple iteration testing for Amazon Q feature development
 
 ### SAM/CFN ("goformation") JSON schema
 
diff --git a/packages/amazonq/test/e2e/amazonq/featureDev.test.ts b/packages/amazonq/test/e2e/amazonq/featureDev.test.ts
index 5965128a144..87099e2a2d0 100644
--- a/packages/amazonq/test/e2e/amazonq/featureDev.test.ts
+++ b/packages/amazonq/test/e2e/amazonq/featureDev.test.ts
@@ -166,6 +166,12 @@ describe('Amazon Q Feature Dev', function () {
 
     describe('/dev {msg} entry', async () => {
         beforeEach(async function () {
+            const isMultiIterationTestsEnabled = process.env['AMAZONQ_FEATUREDEV_ITERATION_TEST'] // Controls whether to enable multiple iteration testing for Amazon Q feature development
+            if (!isMultiIterationTestsEnabled) {
+                this.skip()
+            } else {
+                this.timeout(900000) // Code Gen with multi-iterations requires longer than default timeout(5 mins).
+            }
             tab = framework.createTab()
             tab.addChatMessage({ command: '/dev', prompt })
             tab = framework.getSelectedTab()