diff --git a/editor.html b/editor.html
index 763968e2..cfdd5724 100644
--- a/editor.html
+++ b/editor.html
@@ -180,7 +180,7 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
             <p>{{ hint }}</p>
             <p><button id="button-decrypt-link">{{ button }}</button></p>
         </script>
-        <main id="main" role="main" class="vbox">
+        <main id="main" role="main" class="vbox main">
           <div id="toolbox" class="hbox">
             <div id="commands" class="hbox">
                 <a href="#" class="roundbutton action" id="command-download"
diff --git a/tests/package.json b/tests/package.json
index ec81d5cd..c38c041e 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -15,12 +15,12 @@
     "test:coverage": "npm t -- --coverage",
     "test:ci": "npm t -- --ci --colors"
   },
-  "dependencies": {
-    "@babel/runtime": "^7.7.2"
-  },
+  "dependencies": {},
+  
   "devDependencies": {
     "@wordpress/jest-puppeteer-axe": "^1.3.0",
     "axe-puppeteer": "1.0.0",
+    "@babel/runtime": "^7.7.2",
     "jest": "^24.9.0",
     "node-forge": "0.8.2",
     "node-static": "^0.7.11",
diff --git a/tests/spec/puppeteer-axe-spec.js b/tests/spec/puppeteer-axe-spec.js
index ceac911e..884ed846 100644
--- a/tests/spec/puppeteer-axe-spec.js
+++ b/tests/spec/puppeteer-axe-spec.js
@@ -24,9 +24,37 @@ describe("Puppeteer accessibility tests for the Python Editor.", function() {
     test( 'Checks the editor.html page with Axe', async () => {
         // First, run some code which loads the content of the page.
         const page = await browser.newPage();
+        await page.goto(editorURL);
         await new AxePuppeteer(page).analyze();
         await expect(page).toPassAxeTests({
-            disabledRules: [ 'document-title', 'page-has-heading-one', 'html-has-lang', 'landmark-one-main' ],
+            disabledRules: [ 'tabindex', 'page-has-heading-one' ],
         });
-    } );
+        await page.close();
+    });
+
+    test( 'Checks the Load/Save modal with Axe', async () => {
+        const page = await browser.newPage();
+        await page.goto(editorURL);
+        await page.waitForSelector("#command-files");
+        await page.click("#command-files");
+        await new AxePuppeteer(page).analyze();
+        await expect(page).toPassAxeTests({
+            exclude: '.main',
+            disabledRules: [ 'page-has-heading-one' ],
+        });
+        await page.close();
+    });
+
+    test( 'Checks the Load/Save modal with Axe', async () => {
+        const page = await browser.newPage();
+        await page.goto(editorURL);
+        await page.waitForSelector("#command-snippet");
+        await page.click("#command-snippet");
+        await new AxePuppeteer(page).analyze();
+        await expect(page).toPassAxeTests({
+            exclude: '.main',
+            disabledRules: [ 'page-has-heading-one' ],
+        });
+        await page.close();
+    });
 });