diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5a97a990a..846389b7b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -58,18 +58,19 @@
     
     // Add the IDs of extensions you want installed when the container is created.
     "extensions": [
-        "ms-python.python",
-        "ms-python.vscode-pylance",
-        "ms-azuretools.vscode-docker",
-        "editorconfig.editorconfig",
-        "redhat.vscode-yaml",
-        "visualstudioexptteam.vscodeintellicode",
-        "batisteo.vscode-django",
-        "mutantdino.resourcemonitor",
-        "spmeesseman.vscode-taskexplorer",
-        "mtxr.sqltools",
-        "mtxr.sqltools-driver-mysql"
-    ],
+		"ms-python.python",
+		"ms-python.vscode-pylance",
+		"ms-azuretools.vscode-docker",
+		"editorconfig.editorconfig",
+		"redhat.vscode-yaml",
+		"visualstudioexptteam.vscodeintellicode",
+		"batisteo.vscode-django",
+		"mutantdino.resourcemonitor",
+		"spmeesseman.vscode-taskexplorer",
+		"mtxr.sqltools",
+		"mtxr.sqltools-driver-mysql",
+		"mrmlnc.vscode-duplicate"
+	],
     
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
     "forwardPorts": [8000, 3306],
diff --git a/cypress/integration/meeting/nomcom.spec.js b/cypress/integration/nomcom/expertise.spec.js
similarity index 96%
rename from cypress/integration/meeting/nomcom.spec.js
rename to cypress/integration/nomcom/expertise.spec.js
index 183772716..c1d58c57d 100644
--- a/cypress/integration/meeting/nomcom.spec.js
+++ b/cypress/integration/nomcom/expertise.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 
-describe('nomcom', () => {
+describe('expertise', () => {
     before(() => {
       cy.visit('/nomcom/2021/expertise/')
     })
diff --git a/cypress/integration/nomcom/questionnaires.spec.js b/cypress/integration/nomcom/questionnaires.spec.js
new file mode 100644
index 000000000..0bbdfd0cd
--- /dev/null
+++ b/cypress/integration/nomcom/questionnaires.spec.js
@@ -0,0 +1,18 @@
+/// <reference types="cypress" />
+
+describe('questionnaires', () => {
+    before(() => {
+      cy.visit('/nomcom/2021/questionnaires/')
+    })
+  
+    it('position tabs should display the appropriate panel on click', () => {
+        cy.get('.nomcom-questnr-positions-tabs > li > a').each($tab => {
+            cy.wrap($tab).click()
+            cy.wrap($tab).parent().should('have.class', 'active')
+
+            cy.wrap($tab).invoke('attr', 'href').then($tabId => {
+                cy.get($tabId).should('have.class', 'tab-pane').and('have.class', 'active').and('be.visible')
+            })
+        })
+    })
+})
\ No newline at end of file
diff --git a/ietf/templates/nomcom/questionnaires.html b/ietf/templates/nomcom/questionnaires.html
index 931d331c8..09ac49ef9 100644
--- a/ietf/templates/nomcom/questionnaires.html
+++ b/ietf/templates/nomcom/questionnaires.html
@@ -8,7 +8,7 @@
   {% origin %}
   <h2>Questionnaires</h2>
 
-  <ul class="nav nav-tabs" role="tablist">
+  <ul class="nomcom-questnr-positions-tabs nav nav-tabs" role="tablist">
     {% for position in positions %}
       <li {% if forloop.first %}class="active"{% endif %}>
         <a data-toggle="tab" role="tab" href="#{{ position.name|slugify }}">{{ position.name }}</a>
@@ -16,7 +16,7 @@
     {% endfor %}
   </ul>
 
-  <div class="tab-content">
+  <div class="nomcom-questnr-positions-content tab-content">
     {% for position in positions %}
       <div class="tab-pane {% if forloop.first %}active{% endif %}" id="{{ position.name|slugify }}">
         {{ position.get_questionnaire|linebreaks}}