diff --git a/base/test/fontconfig_util_linux.cc b/base/test/fontconfig_util_linux.cc
index 6848893f2f194f..9ed03c4e6401d9 100644
--- a/base/test/fontconfig_util_linux.cc
+++ b/base/test/fontconfig_util_linux.cc
@@ -36,19 +36,6 @@ const char kFontsConfTemplate[] = R"(<?xml version="1.0"?>
     </edit>
   </match>
 
-  <!-- TODO(thomasanderson): Figure out why this is necessary. -->
-  <match target="pattern">
-    <test name="family" compare="eq">
-      <string>Tinos</string>
-    </test>
-    <test name="prgname" compare="eq">
-      <string>chromevox_tests</string>
-    </test>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-  </match>
-
   <match target="pattern">
     <test qual="any" name="family">
       <string>Times</string>
diff --git a/chrome/browser/resources/chromeos/chromevox/BUILD.gn b/chrome/browser/resources/chromeos/chromevox/BUILD.gn
index 9bc9585f6b11d8..9e91ae9babac22 100644
--- a/chrome/browser/resources/chromeos/chromevox/BUILD.gn
+++ b/chrome/browser/resources/chromeos/chromevox/BUILD.gn
@@ -485,46 +485,16 @@ if (chromevox_compress_js) {
   }
 }
 
-test("chromevox_tests") {
-  sources = [
-    "//chrome/browser/extensions/browsertest_util.cc",
-    "//chrome/browser/extensions/browsertest_util.h",
-    "//chrome/browser/ui/webui/web_ui_test_handler.cc",
-    "//chrome/browser/ui/webui/web_ui_test_handler.h",
-    "//chrome/test/base/extension_js_browser_test.cc",
-    "//chrome/test/base/extension_js_browser_test.h",
-    "//chrome/test/base/extension_load_waiter_one_shot.cc",
-    "//chrome/test/base/extension_load_waiter_one_shot.h",
-    "//chrome/test/base/javascript_browser_test.cc",
-    "//chrome/test/base/javascript_browser_test.h",
-    "//chrome/test/base/test_chrome_web_ui_controller_factory.cc",
-    "//chrome/test/base/test_chrome_web_ui_controller_factory.h",
-    "//chrome/test/base/web_ui_browser_test.cc",
-    "//chrome/test/base/web_ui_browser_test.h",
-  ]
+source_set("browser_tests") {
+  testonly = true
+  assert(enable_extensions)
 
   deps = [
     ":chromevox_extjs_tests",
     ":chromevox_unitjs_tests",
-    "//base",
-    "//base:i18n",
-    "//base/test:test_support",
-    "//chrome:browser_tests_pak",
-    "//chrome:packed_resources",
-    "//chrome:resources",
-    "//chrome:strings",
-    "//chrome/browser",
-    "//chrome/renderer",
-    "//chrome/test:browser_tests_runner",
-    "//chrome/test:test_support",
-    "//chrome/test:test_support_ui",
-    "//content/test:test_support",
-    "//services/service_manager/background:lib",
-    "//testing/gmock",
-    "//testing/gtest",
-    "//ui/keyboard:resources",
   ]
 
+  # TODO(jamescook): Figure out which of these are really necessary.
   data = [
     "$root_out_dir/chrome_100_percent.pak",
     "$root_out_dir/chrome_200_percent.pak",
@@ -661,6 +631,14 @@ js2gtest("chromevox_extjs_tests") {
     "testing/chromevox_next_e2e_test_base.js",
     "testing/mock_feedback.js",
   ]
+
+  # The test base classes generate C++ code with these deps.
+  deps = [
+    "//ash",
+    "//base",
+    "//chrome/browser/chromeos",
+    "//chrome/common",
+  ]
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 }
 
diff --git a/chrome/browser/resources/chromeos/chromevox/braille/braille_display_manager_test.unitjs b/chrome/browser/resources/chromeos/chromevox/braille/braille_display_manager_test.unitjs
index b13608c1873ac2..de1a2d003c92b1 100644
--- a/chrome/browser/resources/chromeos/chromevox/braille/braille_display_manager_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/braille/braille_display_manager_test.unitjs
@@ -11,9 +11,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js',
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxBrailleDisplayManagerUnitTest() {}
+function ChromeVoxBrailleDisplayManagerUnitTest() {}
 
-CvoxBrailleDisplayManagerUnitTest.prototype = {
+ChromeVoxBrailleDisplayManagerUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -179,7 +179,7 @@ chrome.storage = {
 };
 
 
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'NoApi', function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest', 'NoApi', function() {
   var manager = new cvox.BrailleDisplayManager(this.translatorManager);
   manager.setContent(this.NAV_BRAILLE);
   this.translatorManager.setTranslator(this.translator);
@@ -190,7 +190,7 @@ TEST_F('CvoxBrailleDisplayManagerUnitTest', 'NoApi', function() {
  * Test that we don't write to the display when the API is available, but
  * the display is not.
  */
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'NoDisplay', function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest', 'NoDisplay', function() {
   this.addFakeApi();
   this.displayState = {available: false};
 
@@ -204,7 +204,8 @@ TEST_F('CvoxBrailleDisplayManagerUnitTest', 'NoDisplay', function() {
 /**
  * Tests the typical sequence: setContent, setTranslator, setContent.
  */
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'BasicSetContent', function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest', 'BasicSetContent',
+       function() {
   this.addFakeApi();
   this.displayAvailable();
   var manager = new cvox.BrailleDisplayManager(this.translatorManager);
@@ -220,8 +221,8 @@ TEST_F('CvoxBrailleDisplayManagerUnitTest', 'BasicSetContent', function() {
 /**
  * Tests that setting empty content clears the display.
  */
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'SetEmptyContentWithTranslator',
-       function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest',
+       'SetEmptyContentWithTranslator', function() {
   this.addFakeApi();
   this.displayAvailable();
 
@@ -236,7 +237,8 @@ TEST_F('CvoxBrailleDisplayManagerUnitTest', 'SetEmptyContentWithTranslator',
 });
 
 
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'CursorAndPanning', function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest', 'CursorAndPanning',
+       function() {
   var text = 'This is a test string';
   function createNavBrailleWithCursor(start, end) {
     return new cvox.NavBraille({ text: text, startIndex: start,
@@ -276,7 +278,7 @@ TEST_F('CvoxBrailleDisplayManagerUnitTest', 'CursorAndPanning', function() {
  * Tests that the grouping algorithm works with one text character that maps
  * to one braille cell.
  */
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'BasicGroup', function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest', 'BasicGroup', function() {
   var text = 'a';
   var translated = '1';
   var mapping = [0];
@@ -292,7 +294,7 @@ TEST_F('CvoxBrailleDisplayManagerUnitTest', 'BasicGroup', function() {
  * Tests that the grouping algorithm works with one text character that maps
  * to multiple braille cells.
  */
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'OneRtoManyB', function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest', 'OneRtoManyB', function() {
   var text = 'A';
   var translated = '11';
   var mapping = [0,0];
@@ -308,7 +310,7 @@ TEST_F('CvoxBrailleDisplayManagerUnitTest', 'OneRtoManyB', function() {
  * Tests that the grouping algorithm works with one braille cell that maps
  * to multiple text characters.
  */
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'OneBtoManyR', function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest', 'OneBtoManyR', function() {
   var text = 'knowledge';
   var translated = '1';
   var mapping = [0];
@@ -324,7 +326,8 @@ TEST_F('CvoxBrailleDisplayManagerUnitTest', 'OneBtoManyR', function() {
  * Tests that the grouping algorithm works with one string that on both ends,
  * have text characters that map to multiple braille cells.
  */
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'OneRtoManyB_BothEnds', function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest', 'OneRtoManyB_BothEnds',
+       function() {
   var text = 'AbbC';
   var translated = 'X122X3';
   var mapping = [0,0,1,2,3,3];
@@ -340,7 +343,8 @@ TEST_F('CvoxBrailleDisplayManagerUnitTest', 'OneRtoManyB_BothEnds', function() {
  * Tests that the grouping algorithm works with one string that on both ends,
  * have braille cells that map to multiple text characters.
  */
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'OneBtoManyR_BothEnds', function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest', 'OneBtoManyR_BothEnds',
+       function() {
   var text = 'knowledgehappych';
   var translated = '1234456';
   var mapping = [0, 9, 10, 11, 12, 13, 14];
@@ -357,7 +361,7 @@ TEST_F('CvoxBrailleDisplayManagerUnitTest', 'OneBtoManyR_BothEnds', function() {
  * Tests that the grouping algorithm works with one  string that has both types
  * of mapping.
  */
-TEST_F('CvoxBrailleDisplayManagerUnitTest', 'RandB_Random', function() {
+TEST_F('ChromeVoxBrailleDisplayManagerUnitTest', 'RandB_Random', function() {
   var text = 'knowledgeIsPower';
   var translated = '1X23X45678';
   var mapping = [0, 9, 9, 10, 11, 11, 12, 13, 14, 15];
diff --git a/chrome/browser/resources/chromeos/chromevox/braille/braille_input_handler_test.unitjs b/chrome/browser/resources/chromeos/chromevox/braille/braille_input_handler_test.unitjs
index 5e3375c7411c69..789fd66d392a13 100644
--- a/chrome/browser/resources/chromeos/chromevox/braille/braille_input_handler_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/braille/braille_input_handler_test.unitjs
@@ -430,9 +430,9 @@ function cellsToArray(cells) {
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxBrailleInputHandlerUnitTest() {}
+function ChromeVoxBrailleInputHandlerUnitTest() {}
 
-CvoxBrailleInputHandlerUnitTest.prototype = {
+ChromeVoxBrailleInputHandlerUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -534,7 +534,7 @@ CvoxBrailleInputHandlerUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxBrailleInputHandlerUnitTest', 'ConnectFromUnknownExtension',
+TEST_F('ChromeVoxBrailleInputHandlerUnitTest', 'ConnectFromUnknownExtension',
   function() {
   this.port.sender.id = 'your unknown friend';
   chrome.runtime.onConnectExternal.getListener()(this.port);
@@ -542,7 +542,7 @@ TEST_F('CvoxBrailleInputHandlerUnitTest', 'ConnectFromUnknownExtension',
 });
 
 
-TEST_F('CvoxBrailleInputHandlerUnitTest', 'NoTranslator', function() {
+TEST_F('ChromeVoxBrailleInputHandlerUnitTest', 'NoTranslator', function() {
   var editor = this.createEditor();
   editor.setContent('blah', 0);
   editor.setActive(true);
@@ -554,7 +554,7 @@ TEST_F('CvoxBrailleInputHandlerUnitTest', 'NoTranslator', function() {
 });
 
 
-TEST_F('CvoxBrailleInputHandlerUnitTest', 'InputUncontracted', function() {
+TEST_F('ChromeVoxBrailleInputHandlerUnitTest', 'InputUncontracted', function() {
   this.translatorManager.setTranslators(this.uncontractedTranslator, null);
   var editor = this.createEditor();
   editor.setActive(true);
@@ -581,7 +581,7 @@ TEST_F('CvoxBrailleInputHandlerUnitTest', 'InputUncontracted', function() {
 });
 
 
-TEST_F('CvoxBrailleInputHandlerUnitTest', 'InputContracted', function() {
+TEST_F('ChromeVoxBrailleInputHandlerUnitTest', 'InputContracted', function() {
   var editor = this.createEditor();
   this.translatorManager.setTranslators(this.contractedTranslator,
                                         this.uncontractedTranslator);
@@ -641,7 +641,7 @@ TEST_F('CvoxBrailleInputHandlerUnitTest', 'InputContracted', function() {
 });
 
 
-TEST_F('CvoxBrailleInputHandlerUnitTest', 'TypingUrlWithContracted',
+TEST_F('ChromeVoxBrailleInputHandlerUnitTest', 'TypingUrlWithContracted',
        function() {
   var editor = this.createEditor();
   this.translatorManager.setTranslators(this.contractedTranslator,
@@ -665,7 +665,7 @@ TEST_F('CvoxBrailleInputHandlerUnitTest', 'TypingUrlWithContracted',
 });
 
 
-TEST_F('CvoxBrailleInputHandlerUnitTest', 'Backspace', function() {
+TEST_F('ChromeVoxBrailleInputHandlerUnitTest', 'Backspace', function() {
   var editor = this.createEditor();
   this.translatorManager.setTranslators(this.contractedTranslator,
                                         this.uncontractedTranslator);
@@ -695,7 +695,7 @@ TEST_F('CvoxBrailleInputHandlerUnitTest', 'Backspace', function() {
 });
 
 
-TEST_F('CvoxBrailleInputHandlerUnitTest', 'KeysImeNotActive', function() {
+TEST_F('ChromeVoxBrailleInputHandlerUnitTest', 'KeysImeNotActive', function() {
   var editor = this.createEditor();
   this.sendKeyEvent('Enter');
   this.sendKeyEvent('ArrowUp');
diff --git a/chrome/browser/resources/chromeos/chromevox/braille/braille_table_test.extjs b/chrome/browser/resources/chromeos/chromevox/braille/braille_table_test.extjs
index 6adae04396520e..c778bd795a4178 100644
--- a/chrome/browser/resources/chromeos/chromevox/braille/braille_table_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/braille/braille_table_test.extjs
@@ -13,11 +13,11 @@ GEN_INCLUDE(['../testing/chromevox_e2e_test_base.js',
  * @constructor
  * @extends {ChromeVoxE2ETest}
  */
-function CvoxBrailleTableTest() {
+function ChromeVoxBrailleTableTest() {
   ChromeVoxE2ETest.call(this);
 }
 
-CvoxBrailleTableTest.prototype = {
+ChromeVoxBrailleTableTest.prototype = {
   __proto__: ChromeVoxE2ETest.prototype,
 };
 
@@ -25,7 +25,7 @@ CvoxBrailleTableTest.prototype = {
  * Tests that {@code getAll} can fetch and parse the tables file.
  * NOTE: This will need to be adjusted when more tables are added.
  */
-TEST_F('CvoxBrailleTableTest', 'testGetAllAndValidate', function() {
+TEST_F('ChromeVoxBrailleTableTest', 'testGetAllAndValidate', function() {
   cvox.BrailleTable.getAll(this.newCallback(function(tables) {
     expectEquals(68, tables.length);
     assertNotNullNorUndefined(
@@ -40,7 +40,7 @@ TEST_F('CvoxBrailleTableTest', 'testGetAllAndValidate', function() {
 });
 
 /** Tests getDisplayName for some specific representative cases. */
-TEST_F('CvoxBrailleTableTest', 'testGetDisplayName', function() {
+TEST_F('ChromeVoxBrailleTableTest', 'testGetDisplayName', function() {
   cvox.BrailleTable.getAll(this.newCallback(function(tables) {
     var table = cvox.BrailleTable.forId(tables, 'bg-comp8');
     expectEquals('Bulgarian', cvox.BrailleTable.getDisplayName(table));
@@ -55,7 +55,7 @@ TEST_F('CvoxBrailleTableTest', 'testGetDisplayName', function() {
 /**
  * Tests the getUncontracted function.
  */
-TEST_F('CvoxBrailleTableTest', 'testGetUncontracted', function() {
+TEST_F('ChromeVoxBrailleTableTest', 'testGetUncontracted', function() {
   cvox.BrailleTable.getAll(this.newCallback(function(tables) {
     function expectUncontracted(uncontractedId, idToCheck) {
       var checkedTable = cvox.BrailleTable.forId(tables, idToCheck);
diff --git a/chrome/browser/resources/chromeos/chromevox/braille/braille_translator_manager_test.extjs b/chrome/browser/resources/chromeos/chromevox/braille/braille_translator_manager_test.extjs
index ea5dbddafd05ac..ec4ce84979f218 100644
--- a/chrome/browser/resources/chromeos/chromevox/braille/braille_translator_manager_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/braille/braille_translator_manager_test.extjs
@@ -13,11 +13,11 @@ GEN_INCLUDE(['../testing/chromevox_e2e_test_base.js',
  * @constructor
  * @extends {ChromeVoxE2ETest}
  */
-function CvoxBrailleTranslatorManagerTest() {
+function ChromeVoxBrailleTranslatorManagerTest() {
   ChromeVoxE2ETest.call(this);
 }
 
-CvoxBrailleTranslatorManagerTest.prototype = {
+ChromeVoxBrailleTranslatorManagerTest.prototype = {
   __proto__: ChromeVoxE2ETest.prototype,
 
   /** @override */
@@ -78,7 +78,7 @@ function callOnce(callback) {
   };
 }
 
-TEST_F('CvoxBrailleTranslatorManagerTest', 'testInitial', function() {
+TEST_F('ChromeVoxBrailleTranslatorManagerTest', 'testInitial', function() {
   assertEquals(null, this.manager.getExpandingTranslator());
   assertEquals(null, this.manager.getDefaultTranslator());
   assertEquals(null, this.manager.getUncontractedTranslator());
@@ -89,7 +89,7 @@ TEST_F('CvoxBrailleTranslatorManagerTest', 'testInitial', function() {
   });
 });
 
-TEST_F('CvoxBrailleTranslatorManagerTest', 'testRefreshWithoutChange',
+TEST_F('ChromeVoxBrailleTranslatorManagerTest', 'testRefreshWithoutChange',
        function() {
   this.addChangeListener(function() {
     assertNotEquals(null, this.manager.getExpandingTranslator());
@@ -101,7 +101,7 @@ TEST_F('CvoxBrailleTranslatorManagerTest', 'testRefreshWithoutChange',
   });
 });
 
-TEST_F('CvoxBrailleTranslatorManagerTest', 'testRefreshWithChange',
+TEST_F('ChromeVoxBrailleTranslatorManagerTest', 'testRefreshWithChange',
        function() {
   this.addChangeListener(function() {
     assertNotEquals(null, this.manager.getExpandingTranslator());
diff --git a/chrome/browser/resources/chromeos/chromevox/braille/expanding_braille_translator_test.unitjs b/chrome/browser/resources/chromeos/chromevox/braille/expanding_braille_translator_test.unitjs
index 0b772a516881d5..64541cc452e70b 100644
--- a/chrome/browser/resources/chromeos/chromevox/braille/expanding_braille_translator_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/braille/expanding_braille_translator_test.unitjs
@@ -11,9 +11,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js',
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxExpandingBrailleTranslatorUnitTest() {}
+function ChromeVoxExpandingBrailleTranslatorUnitTest() {}
 
-CvoxExpandingBrailleTranslatorUnitTest.prototype = {
+ChromeVoxExpandingBrailleTranslatorUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -78,7 +78,7 @@ function assertArrayBufferMatches(expected, actual) {
   }
 }
 
-TEST_F('CvoxExpandingBrailleTranslatorUnitTest', 'TranslationError',
+TEST_F('ChromeVoxExpandingBrailleTranslatorUnitTest', 'TranslationError',
     function() {
   var text = new Spannable('error ok', new cvox.ValueSpan());
   text.setSpan(new cvox.ValueSelectionSpan, 0, 0);
@@ -255,7 +255,7 @@ function createText(text, opt_selectionStart, opt_selectionEnd, opt_style) {
 
 var TEXT = 'Hello, world!';
 
-TEST_F('CvoxExpandingBrailleTranslatorUnitTest', 'successfulTranslations',
+TEST_F('ChromeVoxExpandingBrailleTranslatorUnitTest', 'successfulTranslations',
        function() {
   /**
    * Dictionary of test strings, keyed on a descriptive name for the
@@ -313,7 +313,7 @@ TEST_F('CvoxExpandingBrailleTranslatorUnitTest', 'successfulTranslations',
   assertEquals(totalExpectedTranslationTests, totalRunTranslationTests);
 });
 
-TEST_F('CvoxExpandingBrailleTranslatorUnitTest', 'StyleTranslations',
+TEST_F('ChromeVoxExpandingBrailleTranslatorUnitTest', 'StyleTranslations',
        function() {
   var formTypeMap = {};
   formTypeMap[cvox.LibLouis.FormType.BOLD] = 'b';
diff --git a/chrome/browser/resources/chromeos/chromevox/braille/liblouis_test.extjs b/chrome/browser/resources/chromeos/chromevox/braille/liblouis_test.extjs
index ee2533c0e49d50..c5e88e3f796866 100644
--- a/chrome/browser/resources/chromeos/chromevox/braille/liblouis_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/braille/liblouis_test.extjs
@@ -15,11 +15,11 @@ GEN_INCLUDE(['../testing/chromevox_e2e_test_base.js',
  * @constructor
  * @extends {ChromeVoxE2ETest}
  */
-function CvoxLibLouisTest() {
+function ChromeVoxLibLouisTest() {
   ChromeVoxE2ETest.call(this);
 }
 
-CvoxLibLouisTest.prototype = {
+ChromeVoxLibLouisTest.prototype = {
   __proto__: ChromeVoxE2ETest.prototype,
 
   createLiblouis: function() {
@@ -48,7 +48,7 @@ function assertEqualsUint8Array(expected, actual) {
   assertEqualsJSON(expected, as_array);
 }
 
-TEST_F('CvoxLibLouisTest', 'checkAllTables', function() {
+TEST_F('ChromeVoxLibLouisTest', 'checkAllTables', function() {
   var liblouis = this.createAndAttachLiblouis();
   cvox.BrailleTable.getAll(this.newCallback(function(tables) {
     var i = 0;
@@ -66,7 +66,7 @@ TEST_F('CvoxLibLouisTest', 'checkAllTables', function() {
   }.bind(this)));
 });
 
-TEST_F('CvoxLibLouisTest', 'testTranslateComputerBraille', function() {
+TEST_F('ChromeVoxLibLouisTest', 'testTranslateComputerBraille', function() {
   var liblouis = this.createAndAttachLiblouis();
   this.withTranslator(liblouis, 'en-us-comp8.ctb', function(translator) {
     translator.translate('Hello!', [], this.newCallback(
@@ -78,7 +78,7 @@ TEST_F('CvoxLibLouisTest', 'testTranslateComputerBraille', function() {
   });
 });
 
-TEST_F('CvoxLibLouisTest', 'testBackTranslateComputerBraille', function() {
+TEST_F('ChromeVoxLibLouisTest', 'testBackTranslateComputerBraille', function() {
   var liblouis = this.createAndAttachLiblouis();
   this.withTranslator(liblouis, 'en-us-comp8.ctb', function(translator) {
     var cells = new Uint8Array([0x53, 0x11, 0x07, 0x07, 0x15, 0x2e]);
@@ -88,7 +88,7 @@ TEST_F('CvoxLibLouisTest', 'testBackTranslateComputerBraille', function() {
   });
 });
 
-TEST_F('CvoxLibLouisTest', 'testTranslateGermanGrade2Braille', function() {
+TEST_F('ChromeVoxLibLouisTest', 'testTranslateGermanGrade2Braille', function() {
   var liblouis = this.createAndAttachLiblouis();
   // This is one of the moderately large tables.
   this.withTranslator(liblouis, 'de-de-g2.ctb', function(translator) {
@@ -101,7 +101,7 @@ TEST_F('CvoxLibLouisTest', 'testTranslateGermanGrade2Braille', function() {
   });
 });
 
-TEST_F('CvoxLibLouisTest', 'testBackTranslateGermanComputerBraille', function() {
+TEST_F('ChromeVoxLibLouisTest', 'testBackTranslateGermanComputerBraille', function() {
   var liblouis = this.createAndAttachLiblouis();
   this.withTranslator(liblouis, 'de-de-comp8.ctb', function(translator) {
     var cells = new Uint8Array([0xb3]);
@@ -111,7 +111,7 @@ TEST_F('CvoxLibLouisTest', 'testBackTranslateGermanComputerBraille', function()
   });
 });
 
-TEST_F('CvoxLibLouisTest', 'testBackTranslateEmptyCells', function() {
+TEST_F('ChromeVoxLibLouisTest', 'testBackTranslateEmptyCells', function() {
   var liblouis = this.createAndAttachLiblouis();
   this.withTranslator(liblouis, 'de-de-comp8.ctb', function(translator) {
        translator.backTranslate(
@@ -123,7 +123,7 @@ TEST_F('CvoxLibLouisTest', 'testBackTranslateEmptyCells', function() {
   });
 });
 
-TEST_F('CvoxLibLouisTest', 'testGetTranslatorBeforeAttach', function() {
+TEST_F('ChromeVoxLibLouisTest', 'testGetTranslatorBeforeAttach', function() {
   var liblouis = this.createLiblouis();
   assertFalse(liblouis.isAttached());
   this.withTranslator(liblouis, 'en-us-comp8.ctb', function(translator) {
@@ -131,14 +131,14 @@ TEST_F('CvoxLibLouisTest', 'testGetTranslatorBeforeAttach', function() {
   });
 });
 
-TEST_F('CvoxLibLouisTest', 'testGetInvalidTranslator', function() {
+TEST_F('ChromeVoxLibLouisTest', 'testGetInvalidTranslator', function() {
   var liblouis = this.createAndAttachLiblouis();
   this.withTranslator(liblouis, 'nonexistant-table', function(translator) {
     assertEquals(null, translator);
   });
 });
 
-TEST_F('CvoxLibLouisTest', 'testTranslateAfterDetach', function() {
+TEST_F('ChromeVoxLibLouisTest', 'testTranslateAfterDetach', function() {
   var liblouis = this.createAndAttachLiblouis();
   this.withTranslator(liblouis, 'de-de-comp8.ctb', function(translator) {
     liblouis.detach();
@@ -151,7 +151,7 @@ TEST_F('CvoxLibLouisTest', 'testTranslateAfterDetach', function() {
   });
 });
 
-TEST_F('CvoxLibLouisTest', 'testDetachWithOutstandingCallbacks', function() {
+TEST_F('ChromeVoxLibLouisTest', 'testDetachWithOutstandingCallbacks', function() {
   var liblouis = this.createAndAttachLiblouis();
   this.withTranslator(liblouis, 'de-de-comp8.ctb', function(translator) {
     var called = false;
@@ -167,7 +167,7 @@ TEST_F('CvoxLibLouisTest', 'testDetachWithOutstandingCallbacks', function() {
   });
 });
 
-TEST_F('CvoxLibLouisTest', 'testKeyEventStaticData', function() {
+TEST_F('ChromeVoxLibLouisTest', 'testKeyEventStaticData', function() {
   var liblouis = this.createAndAttachLiblouis();
   this.withTranslator(liblouis, 'en-us-comp8.ctb', function(translator) {
     translator.translate('abcdefghijklmnopqrstuvwxyz 0123456789', [],
diff --git a/chrome/browser/resources/chromeos/chromevox/braille/pan_strategy_test.unitjs b/chrome/browser/resources/chromeos/chromevox/braille/pan_strategy_test.unitjs
index 161d4fa327ace0..0ce7de27629181 100644
--- a/chrome/browser/resources/chromeos/chromevox/braille/pan_strategy_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/braille/pan_strategy_test.unitjs
@@ -9,9 +9,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxPanStrategyUnitTest() {}
+function ChromeVoxPanStrategyUnitTest() {}
 
-CvoxPanStrategyUnitTest.prototype = {
+ChromeVoxPanStrategyUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -36,7 +36,7 @@ function createArrayBuffer(content) {
   return result;
 }
 
- TEST_F('CvoxPanStrategyUnitTest', 'FixedPanning', function() {
+ TEST_F('ChromeVoxPanStrategyUnitTest', 'FixedPanning', function() {
   var panner = new cvox.PanStrategy();
   panner.setPanStrategy(false);
 
@@ -89,7 +89,8 @@ function createArrayBuffer(content) {
   assertEqualsJSON({firstRow: 0, lastRow: 1}, panner.viewPort);
 });
 
-TEST_F('CvoxPanStrategyUnitTest', 'WrappedPanningSingleLine', function() {
+TEST_F('ChromeVoxPanStrategyUnitTest', 'WrappedPanningSingleLine',
+       function() {
   var panner = new cvox.PanStrategy();
   panner.setPanStrategy(true);
 
@@ -142,7 +143,7 @@ TEST_F('CvoxPanStrategyUnitTest', 'WrappedPanningSingleLine', function() {
         panner.getCurrentBrailleViewportContents());
 });
 
-TEST_F('CvoxPanStrategyUnitTest', 'WrappedPanningMultiline', function() {
+TEST_F('ChromeVoxPanStrategyUnitTest', 'WrappedPanningMultiline', function() {
   var panner = new cvox.PanStrategy();
   panner.setPanStrategy(true);
 
@@ -172,7 +173,7 @@ TEST_F('CvoxPanStrategyUnitTest', 'WrappedPanningMultiline', function() {
         panner.getCurrentBrailleViewportContents());
 });
 
-TEST_F('CvoxPanStrategyUnitTest', 'FixedSetContent', function() {
+TEST_F('ChromeVoxPanStrategyUnitTest', 'FixedSetContent', function() {
   var panner = new cvox.PanStrategy();
   panner.setPanStrategy(false);
 
@@ -188,7 +189,7 @@ TEST_F('CvoxPanStrategyUnitTest', 'FixedSetContent', function() {
   assertArraysEquals(expectedMappingValue, panner.brailleToText);
 });
 
-TEST_F('CvoxPanStrategyUnitTest', 'WrappedSetContent', function() {
+TEST_F('ChromeVoxPanStrategyUnitTest', 'WrappedSetContent', function() {
   var panner = new cvox.PanStrategy();
   panner.setPanStrategy(true);
 
@@ -245,7 +246,8 @@ TEST_F('CvoxPanStrategyUnitTest', 'WrappedSetContent', function() {
   assertArraysEquals(expectedMappingValue, panner.brailleToText);
 });
 
-TEST_F('CvoxPanStrategyUnitTest', 'getCurrentTextViewportContents', function() {
+TEST_F('ChromeVoxPanStrategyUnitTest', 'getCurrentTextViewportContents',
+       function() {
   var panner = new cvox.PanStrategy();
   panner.setPanStrategy(true);
 
@@ -269,7 +271,7 @@ TEST_F('CvoxPanStrategyUnitTest', 'getCurrentTextViewportContents', function() {
   assertEquals('789', panner.getCurrentTextViewportContents());
 });
 
-TEST_F('CvoxPanStrategyUnitTest', 'WrappedUnwrappedCursors', function() {
+TEST_F('ChromeVoxPanStrategyUnitTest', 'WrappedUnwrappedCursors', function() {
   var panner = new cvox.PanStrategy();
   panner.setPanStrategy(true);
 
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher_test.unitjs b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher_test.unitjs
index 6582e122f68909..23184e4344d58e 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher_test.unitjs
@@ -10,11 +10,11 @@ GEN_INCLUDE(['../../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxEventWatcherUnitTest() {
+function ChromeVoxEventWatcherUnitTest() {
   ChromeVoxUnitTestBase.call(this);
 }
 
-CvoxEventWatcherUnitTest.prototype = {
+ChromeVoxEventWatcherUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -84,7 +84,7 @@ CvoxEventWatcherUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxEventWatcherUnitTest', 'ButtonFocusFeedback', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'ButtonFocusFeedback', function() {
   this.loadHtml('<div> <button id="alpha">Alpha</button> </div>');
   this.setFocus('alpha');
   this.waitForCalm(this.assertSpoken, 'Alpha Button');
@@ -93,7 +93,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'ButtonFocusFeedback', function() {
 /**
  * Test feedback when focusing links backwards (like shift-tabbing).
  */
-TEST_F('CvoxEventWatcherUnitTest', 'FocusLinksBackwards', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'FocusLinksBackwards', function() {
   this.loadHtml('<div> <p>before</p>' +
       '<p><a href="#" id="l1">1</a></p>' +
       '<p><a href="#" id="l2">2</a></p>' +
@@ -113,7 +113,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'FocusLinksBackwards', function() {
 /**
  * Test feedback when an editable text field gets focus.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'TextFocusFeedback', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'TextFocusFeedback', function() {
   this.loadHtml('<div>' +
       '<label for="mytext">Label</label>' +
       '<input id="mytext" value="Value" title="Title" />' +
@@ -126,7 +126,8 @@ TEST_F('CvoxEventWatcherUnitTest', 'TextFocusFeedback', function() {
 /**
  * Test feedback when a contenteditable field gets focus.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'ContentEditableFocusFeedback', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'ContentEditableFocusFeedback',
+       function() {
   this.loadHtml('<div>' +
       '<label for="mytext">Label</label>' +
       '<div id="mytext" contentEditable>This is editable</div>' +
@@ -140,7 +141,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'ContentEditableFocusFeedback', function() {
  * Test feedback when an item in an dialog receives focus and then focus
  *     leaves the dialog.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'DialogFeedback', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'DialogFeedback', function() {
   this.loadHtml('<div>' +
       '<button id="show">Show</button>' +
       '<div aria-label="compose message" role="dialog">' +
@@ -166,7 +167,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'DialogFeedback', function() {
 /**
  * Test feedback when an item in an alert dialog receives focus.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'AlertDialogFeedback', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'AlertDialogFeedback', function() {
   this.loadHtml('<div>' +
       '<div role="alertdialog">' +
       '  <p>Are you sure you want to install Windows?</p>' +
@@ -187,7 +188,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'AlertDialogFeedback', function() {
  * quickly - make sure the notification that we entered the dialog
  * isn't interrupted.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'DoubleFocusAlertDialogFeedback',
+TEST_F('ChromeVoxEventWatcherUnitTest', 'DoubleFocusAlertDialogFeedback',
     function() {
   this.loadHtml('<div>' +
       '<div role="alertdialog">' +
@@ -216,7 +217,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'DoubleFocusAlertDialogFeedback',
 /**
  * Test recovery when a dialog box closes and the user sends a tab event.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'CloseDialogTabRecovery', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'CloseDialogTabRecovery', function() {
   this.loadHtml('<div id="container">' +
       '<p id="first">first node</p>' +
       '<button id="button">valid button before</button>' +
@@ -247,7 +248,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'CloseDialogTabRecovery', function() {
 /**
  * Test feedback when a list box with an active descendant receives focus.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'ListBoxFeedback', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'ListBoxFeedback', function() {
   this.loadHtml('<div>' +
       '<p id="before">My listbox</p>' +
       '<div id="listbox" role="listbox" tabindex="0"' +
@@ -278,7 +279,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'ListBoxFeedback', function() {
 /**
  * Test feedback when the items of a list box receive focus.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'ListBoxOptionFeedback', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'ListBoxOptionFeedback', function() {
   this.loadHtml('<div>' +
       '<p id="before">My listbox</p>' +
       '<div id="listbox" role="listbox">' +
@@ -302,7 +303,8 @@ TEST_F('CvoxEventWatcherUnitTest', 'ListBoxOptionFeedback', function() {
  * Test feedback when the list box is setting focus in response to arrow
  * (or some other) keypress and the user is also using ChromeVox navigation.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'ListBoxOptionFeedbackWithFocus', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'ListBoxOptionFeedbackWithFocus',
+       function() {
   this.loadHtml('<div>' +
       '<p id="before">My listbox</p>' +
       '<div id="listbox" role="listbox">' +
@@ -333,7 +335,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'ListBoxOptionFeedbackWithFocus', function()
  * The low-level details are tested in editable_text_test.js, this is
  * a higher-level test of how that code interacts with the event watcher.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'EditableText', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'EditableText', function() {
   cvox.ChromeVoxEditableTextBase.eventTypingEcho = false;
   this.loadHtml('<div>' +
       '<button id="before">Before</button>' +
@@ -369,7 +371,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'EditableText', function() {
  * The low-level details are tested in editable_text_test.js, this is
  * a higher-level test of how that code interacts with the event watcher.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'EditableTextListbox', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'EditableTextListbox', function() {
   this.loadHtml('<div>' +
       '<button id="before">Before</button>' +
       '<label for="input">Query</label>' +
@@ -402,7 +404,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'EditableTextListbox', function() {
  * The low-level details are tested in editable_text_test.js, this is
  * a higher-level test of how that code interacts with the event watcher.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'EditableTextListboxUpdatingInput',
+TEST_F('ChromeVoxEventWatcherUnitTest', 'EditableTextListboxUpdatingInput',
     function() {
   cvox.ChromeVoxEditableTextBase.shouldSpeakInsertions = true;
   this.loadHtml('<div>' +
@@ -434,7 +436,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'EditableTextListboxUpdatingInput',
 /**
  * Tests navigating through a multiline text area.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'MultilineNavigation', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'MultilineNavigation', function() {
   this.loadHtml('<div> <textarea id="area">' +
       'one' +
       '\n\n' +
@@ -474,7 +476,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'MultilineNavigation', function() {
       .waitForCalm(this.assertSpoken, 'three');
 });
 
-SYNC_TEST_F('CvoxEventWatcherUnitTest', 'ShouldWaitToProcess', function() {
+SYNC_TEST_F('ChromeVoxEventWatcherUnitTest', 'ShouldWaitToProcess', function() {
   // The focus event just happened, wait.
   assertTrue(
       cvox.ChromeVoxEventWatcherUtil.shouldWaitToProcess(100, 100, 100));
@@ -491,7 +493,7 @@ SYNC_TEST_F('CvoxEventWatcherUnitTest', 'ShouldWaitToProcess', function() {
  * Test that no feedback is received for events that fire on elements
  * that are hidden (or the descendant of a hidden element).
  */
-TEST_F('CvoxEventWatcherUnitTest', 'AriaHiddenFeedback', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'AriaHiddenFeedback', function() {
   this.loadHtml('<div>' +
       '<div>' +
       '  <button id="button1">Button 1</button>' +
@@ -523,7 +525,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'AriaHiddenFeedback', function() {
  * Test that key down events don't cause excessive value and state announcements
  * when arrowing around radiobuttons.
  */
-TEST_F('CvoxEventWatcherUnitTest',
+TEST_F('ChromeVoxEventWatcherUnitTest',
        'DISABLED_RadioButtonAnnouncements',
        function() {
   this.loadHtml(
@@ -561,7 +563,7 @@ TEST_F('CvoxEventWatcherUnitTest',
  * Test time widget.
  * Disabled because test relies on removed behavior; see crbug.com/520519.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'DISABLED_TimeWidget', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'DISABLED_TimeWidget', function() {
   this.loadHtml(
     '<label for="timewidget">Set alarm for:</label>' +
     '<input id="timewidget" type="time" value="12:00">');
@@ -619,7 +621,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'DISABLED_TimeWidget', function() {
  * Test date widget.
  * Disabled because test relies on removed behavior; see crbug.com/520519.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'DISABLED_DateWidget', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'DISABLED_DateWidget', function() {
   this.loadHtml(
     '<label for="datewidget">Set birthdate:</label>' +
     '<input id="datewidget" type="date" value="1998-09-04"/>');
@@ -674,7 +676,7 @@ TEST_F('CvoxEventWatcherUnitTest', 'DISABLED_DateWidget', function() {
  * Test that ChromeVox speaks the correct state when a focused control
  * changes as the result of a key up, not just key down.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'ToggleOnKeyUp', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'ToggleOnKeyUp', function() {
   this.loadHtml('<div>' +
       '<div tabIndex=0 id="pressable" role="button" aria-pressed="false">' +
       'Toggle' +
@@ -711,7 +713,8 @@ TEST_F('CvoxEventWatcherUnitTest', 'ToggleOnKeyUp', function() {
 /**
  * Exiting dialog message should not interrupt a live region.
  */
-TEST_F('CvoxEventWatcherUnitTest', 'DISABLED_ExitDialogWithLiveRegion', function() {
+TEST_F('ChromeVoxEventWatcherUnitTest', 'DISABLED_ExitDialogWithLiveRegion',
+       function() {
   this.loadHtml(
       '<div role="dialog" aria-label="MyAlert">' +
       '  <h1>Heading</h1>' +
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions_test.unitjs b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions_test.unitjs
index e43e82a420077b..bf7256da97ad86 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions_test.unitjs
@@ -10,11 +10,11 @@ GEN_INCLUDE(['../../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxLiveRegionsUnitTest() {
+function ChromeVoxLiveRegionsUnitTest() {
   ChromeVoxUnitTestBase.call(this);
 }
 
-CvoxLiveRegionsUnitTest.prototype = {
+ChromeVoxLiveRegionsUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -37,7 +37,7 @@ CvoxLiveRegionsUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxLiveRegionsUnitTest', 'InsertNonLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'InsertNonLiveRegion', function() {
   var region = document.createElement('div');
   region.innerHTML = '<div role="button">Alpha</div>';
   document.body.appendChild(region);
@@ -52,7 +52,8 @@ TEST_F('CvoxLiveRegionsUnitTest', 'InsertNonLiveRegion', function() {
  * Test inserting an 'alert' live region.
  */
 // Flaky on Chromium OS: crbug.com/498881.
-TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_InsertAlertLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'DISABLED_InsertAlertLiveRegion',
+       function() {
   var region = document.createElement('div');
   region.innerHTML = '<div role="alert">Alpha</div>';
   document.body.appendChild(region);
@@ -69,7 +70,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_InsertAlertLiveRegion', function() {
  * Test making text appear inside an 'alert' live region by setting its
  * display to something other than 'none'.
  */
-TEST_F('CvoxLiveRegionsUnitTest', 'RevealAlertLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'RevealAlertLiveRegion', function() {
   this.loadDoc(function() {/*!
     <div role="alert">
       <style>
@@ -95,7 +96,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'RevealAlertLiveRegion', function() {
  * Test inserting a 'polite' live region.
  */
 // Flaky on Chromium OS: crbug.com/498881.
-TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_InsertPoliteLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'DISABLED_InsertPoliteLiveRegion', function() {
   var region = document.createElement('div');
   region.innerHTML = '<div aria-live="polite">Beta</div>';
   document.body.appendChild(region);
@@ -110,7 +111,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_InsertPoliteLiveRegion', function()
 /**
  * Test modifying an existing status live region.
  */
-TEST_F('CvoxLiveRegionsUnitTest', 'ModifyStatusLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'ModifyStatusLiveRegion', function() {
   var region = document.createElement('div');
   region.innerHTML = '<div id="status" role="status">Gamma</div>';
   document.body.appendChild(region);
@@ -130,7 +131,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'ModifyStatusLiveRegion', function() {
 /**
  * Test adding element to a atomic and non-atomic live regions.
  */
-TEST_F('CvoxLiveRegionsUnitTest', 'AddToLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'AddToLiveRegion', function() {
   this.loadDoc(function() {/*!
     <div>
       <div id="non_atomic_buddylist" aria-live="polite">
@@ -163,7 +164,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'AddToLiveRegion', function() {
  * Test removing elements from live regions.
  */
 // Flaky on Chromium OS: crbug.com/498881.
-TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_RemoveFromLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'DISABLED_RemoveFromLiveRegion', function() {
   this.loadDoc(function() {/*!
     <div>
       <div id="buddylist2" aria-relevant="removals">
@@ -187,7 +188,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_RemoveFromLiveRegion', function() {
 /**
  * Test live region that's a progress bar through the event watcher.
  */
-TEST_F('CvoxLiveRegionsUnitTest', 'ProgressBarLiveRegionEvents', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'ProgressBarLiveRegionEvents', function() {
   this.loadDoc(function() {/*!
     <div id="progress" role="progressbar" aria-live="polite" aria-valuenow="1">
       <div id="ptext">
@@ -209,7 +210,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'ProgressBarLiveRegionEvents', function() {
  * Test 'alert' live region inserted as a result of focus change, like
  *   when there's an error message when filling out a form.
  */
-TEST_F('CvoxLiveRegionsUnitTest', 'FocusTriggeredAlertLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'FocusTriggeredAlertLiveRegion', function() {
   this.loadDoc(function() {/*!
     <form id="form">
       <label>
@@ -256,7 +257,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'FocusTriggeredAlertLiveRegion', function() {
  * Test focus followed by live region change, make sure both are spoken.
  */
 // Flaky on Chromium OS: crbug.com/498881.
-TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_FocusThenLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'DISABLED_FocusThenLiveRegion', function() {
   this.loadDoc(function() {/*!
     <button id="button_to_focus">Button To Focus</button>
     <div id="live" aria-live="polite"></div>
@@ -277,7 +278,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_FocusThenLiveRegion', function() {
  * Test live region change followed by focus, make sure both are spoken.
  */
 // Flaky on Chromium OS: crbug.com/498881.
-TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_LiveRegionThenFocus', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'DISABLED_LiveRegionThenFocus', function() {
   this.loadDoc(function() {/*!
     <button id="button_to_focus">Button To Focus</button>
     <div id="live" aria-live="polite"></div>
@@ -301,7 +302,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_LiveRegionThenFocus', function() {
  * one utterance until this bug is fixed: http://crbug.com/415679
  */
 // Flaky on Chromium OS: crbug.com/498881.
-TEST_F('CvoxLiveRegionsUnitTest', 'DISABLED_TwoElementsInLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsUnitTest', 'DISABLED_TwoElementsInLiveRegion', function() {
   this.loadDoc(function() {/*!
     <div id="live" aria-live="polite">
       <div id="hidden" style="display:none">
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager_test.unitjs b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager_test.unitjs
index f807f25b5e6fa2..0294711f4d89ba 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager_test.unitjs
@@ -10,11 +10,11 @@ GEN_INCLUDE(['../../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxNavigationManagerUnitTest() {
+function ChromeVoxNavigationManagerUnitTest() {
   ChromeVoxUnitTestBase.call(this);
 }
 
-CvoxNavigationManagerUnitTest.prototype = {
+ChromeVoxNavigationManagerUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -55,7 +55,7 @@ CvoxNavigationManagerUnitTest.prototype = {
     this.waitForCalm(cvox.ChromeVoxTester.setStrategy, strategy)
         .waitForCalm(cvox.ChromeVoxTester.syncToFirstNode);
 
-    var depth = 0;    
+    var depth = 0;
     commandsAndExpectations.forEach((function(ce) {
       this.waitForCalm(function() {
         if (ce.command) {
@@ -119,7 +119,7 @@ CvoxNavigationManagerUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxNavigationManagerUnitTest', 'SimpleStaticHTML', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'SimpleStaticHTML', function() {
   this.loadHtml(
       '<div>' +
         '<p id="before">Before</p>' +
@@ -145,7 +145,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'SimpleStaticHTML', function() {
  * Test navigation of simple static HTML with some control elements to validate
  *      the text and annotation returned when doing navigation.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'ControlElements', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'ControlElements', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -182,7 +182,8 @@ TEST_F('CvoxNavigationManagerUnitTest', 'ControlElements', function() {
  *     fieldset to validate the text and annotation returned when doing
  *     navigation.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'ControlElementsWithFieldset', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'ControlElementsWithFieldset',
+       function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -222,7 +223,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'ControlElementsWithFieldset', function(
 /**
  * Test skip to next/prev element navigation.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'SkipNavigation', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'SkipNavigation', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -261,7 +262,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'SkipNavigation', function() {
 /**
  * Test finding the next heading.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'FindNextHeading', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'FindNextHeading', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -330,7 +331,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'FindNextHeading', function() {
 /**
  * Test navigation of HTML and ARIA lists.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'ListLinearNav', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'ListLinearNav', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -395,7 +396,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'ListLinearNav', function() {
 /**
  * Test navigation of HTML and ARIA lists.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'ListSmartNav', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'ListSmartNav', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -450,7 +451,8 @@ TEST_F('CvoxNavigationManagerUnitTest', 'ListSmartNav', function() {
 /**
  * Test smart navigation of link collections.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'LinkCollectionSmartNav', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'LinkCollectionSmartNav',
+       function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -507,7 +509,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'LinkCollectionSmartNav', function() {
 /**
  * Test navigation of a control followed by its label.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'ControlThenLabel', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'ControlThenLabel', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -541,7 +543,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'ControlThenLabel', function() {
 /**
  * Test navigation of a label followed by its control.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'LabelThenControl', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'LabelThenControl', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -576,7 +578,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'LabelThenControl', function() {
  * Test navigation of a control inside a label element (yes, this is
  *     valid HTML and should be supported).
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'ControlInsideLabel', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'ControlInsideLabel', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -628,7 +630,8 @@ TEST_F('CvoxNavigationManagerUnitTest', 'ControlInsideLabel', function() {
  * Test navigation of two controls inside a single label element - this
  *     is nonstandard but we should make sure we don't totally fail!
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'TwoControlsInsideLabel', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'TwoControlsInsideLabel',
+       function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -676,7 +679,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'TwoControlsInsideLabel', function() {
  * Test invalid labels - if a label doesn't point to a control, it
  *     should just be read as if it wasn't a label.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'InvalidLabels', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'InvalidLabels', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -718,7 +721,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'InvalidLabels', function() {
 /**
  * Test scrollbar value readout.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'Scrollbar', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'Scrollbar', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -742,7 +745,8 @@ TEST_F('CvoxNavigationManagerUnitTest', 'Scrollbar', function() {
 /**
  * Test ARIA listbox where the whole box gets focus.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'AriaListboxActiveDescendant', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'AriaListboxActiveDescendant',
+       function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -803,7 +807,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'AriaListboxActiveDescendant', function(
 /**
  * Test ARIA listbox where each option gets focus.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'AriaListboxOption', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'AriaListboxOption', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -898,7 +902,8 @@ TEST_F('CvoxNavigationManagerUnitTest', 'AriaListboxOption', function() {
  * Test ARIA listbox where each option gets focus and the outer container has
  * tabindex="-1"
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'AriaListboxOptionOuterFocus', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'AriaListboxOptionOuterFocus',
+       function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -937,7 +942,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'AriaListboxOptionOuterFocus', function(
 /**
  * Test ARIA menus.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'AriaMenus', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'AriaMenus', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -977,7 +982,8 @@ TEST_F('CvoxNavigationManagerUnitTest', 'AriaMenus', function() {
 /**
  * Test left and right navigation at the group level.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'LeftRightGroupNavigation', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'LeftRightGroupNavigation',
+       function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -1019,7 +1025,8 @@ TEST_F('CvoxNavigationManagerUnitTest', 'LeftRightGroupNavigation', function() {
 /**
  * Test left and right navigation at the sentence level.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'LeftRightSentenceNavigation', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'LeftRightSentenceNavigation',
+       function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -1073,7 +1080,8 @@ TEST_F('CvoxNavigationManagerUnitTest', 'LeftRightSentenceNavigation', function(
 /**
  * Test left and right navigation at the word level.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'LeftRightWordNavigation', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'LeftRightWordNavigation',
+       function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -1131,7 +1139,8 @@ TEST_F('CvoxNavigationManagerUnitTest', 'LeftRightWordNavigation', function() {
 /**
  * Test left and right navigation at the character level.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'LeftRightCharacterNavigation', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'LeftRightCharacterNavigation',
+       function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -1205,7 +1214,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'LeftRightCharacterNavigation', function
 /**
  * Test whether fullyDescribe works
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'FullyDescribe', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'FullyDescribe', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -1252,7 +1261,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'FullyDescribe', function() {
 /**
  * Test continuous reading mode.
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'ContinuousReading', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'ContinuousReading', function() {
   this.loadHtml(
     '<div id="continuousTest">' +
       '<p id="before">Before</p>' +
@@ -1274,7 +1283,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'ContinuousReading', function() {
 /**
  * Test HTML5 semantic elements
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'SemanticElts', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'SemanticElts', function() {
   this.loadHtml(
     '<p id="before">Before</p>' +
     '<article>' +
@@ -1331,7 +1340,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'SemanticElts', function() {
 /**
  * Test aria-haspopup
  */
-TEST_F('CvoxNavigationManagerUnitTest', 'AriaHasPopup', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'AriaHasPopup', function() {
   this.loadHtml(
     '<div>' +
       '<p id="before">Before</p>' +
@@ -1374,7 +1383,7 @@ TEST_F('CvoxNavigationManagerUnitTest', 'AriaHasPopup', function() {
 
 
 /** Test Aria Math Roles. */
-TEST_F('CvoxNavigationManagerUnitTest', 'AriaMathRoles', function() {
+TEST_F('ChromeVoxNavigationManagerUnitTest', 'AriaMathRoles', function() {
   this.loadHtml(
     '<p><div role="math"' +
     'aria-label="a times x squared plus b times x plus c equals 0">' +
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/user_commands_test.unitjs b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/user_commands_test.unitjs
index f425d10719dbe5..a96283b23a19fe 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/user_commands_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/user_commands_test.unitjs
@@ -10,11 +10,11 @@ GEN_INCLUDE(['../../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxUserCommandsUnitTest() {
+function ChromeVoxUserCommandsUnitTest() {
   ChromeVoxUnitTestBase.call(this);
 }
 
-CvoxUserCommandsUnitTest.prototype = {
+ChromeVoxUserCommandsUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -36,7 +36,7 @@ CvoxUserCommandsUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxUserCommandsUnitTest', 'TabHandling', function() {
+TEST_F('ChromeVoxUserCommandsUnitTest', 'TabHandling', function() {
   this.loadDoc(function() {/*!
     <div>
       <p id="before">Before</p>
@@ -65,7 +65,7 @@ TEST_F('CvoxUserCommandsUnitTest', 'TabHandling', function() {
  * Tests everything in the find next map to make sure there are no
  * typos and everything is valid.
  */
-SYNC_TEST_F('CvoxUserCommandsUnitTest', 'FindNextMap', function() {
+SYNC_TEST_F('ChromeVoxUserCommandsUnitTest', 'FindNextMap', function() {
   var findMap = cvox.ChromeVoxUserCommands.FIND_NEXT_MAP_;
   for (var find in findMap) {
     assertTrue(
@@ -87,7 +87,7 @@ SYNC_TEST_F('CvoxUserCommandsUnitTest', 'FindNextMap', function() {
  * is valid.
  * @export
  */
-SYNC_TEST_F('CvoxUserCommandsUnitTest', 'CommandsMap', function() {
+SYNC_TEST_F('ChromeVoxUserCommandsUnitTest', 'CommandsMap', function() {
   var cmdMap = cvox.ChromeVoxUserCommands.CMD_WHITELIST_;
   var findMap = cvox.ChromeVoxUserCommands.FIND_NEXT_MAP_;
   for (var cmd in cmdMap) {
diff --git a/chrome/browser/resources/chromeos/chromevox/common/aria_util_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/aria_util_test.unitjs
index bf13830445be48..17fed82cc2081c 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/aria_util_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/aria_util_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxAriaUtilUnitTest() {}
+function ChromeVoxAriaUtilUnitTest() {}
 
-CvoxAriaUtilUnitTest.prototype = {
+ChromeVoxAriaUtilUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -22,7 +22,7 @@ CvoxAriaUtilUnitTest.prototype = {
     'cvox.DomUtil',]
 };
 
-TEST_F('CvoxAriaUtilUnitTest', 'GetStateGridWithActiveCell', function() {
+TEST_F('ChromeVoxAriaUtilUnitTest', 'GetStateGridWithActiveCell', function() {
   this.loadDoc(function() {/*!
     <div id="grid" role="grid" aria-activedescendant="cell">
       <div role="row">
@@ -35,7 +35,7 @@ TEST_F('CvoxAriaUtilUnitTest', 'GetStateGridWithActiveCell', function() {
       eqJSON([['role_gridcell_pos', 1, 1]]));
 });
 
-TEST_F('CvoxAriaUtilUnitTest', 'GetActiveDescendant', function() {
+TEST_F('ChromeVoxAriaUtilUnitTest', 'GetActiveDescendant', function() {
   this.loadDoc(function() {/*!
     <div id="top" aria-activedescendant="child">
       <div id="child" />
@@ -75,7 +75,7 @@ TEST_F('CvoxAriaUtilUnitTest', 'GetActiveDescendant', function() {
   assertEquals(null, cvox.AriaUtil.getActiveDescendant(circleAElt));
 });
 
-TEST_F('CvoxAriaUtilUnitTest', 'ListIndexAndState', function() {
+TEST_F('ChromeVoxAriaUtilUnitTest', 'ListIndexAndState', function() {
   this.loadDoc(function() {/*!
     <div id="l" role="listbox" tabindex="0" aria-activedescendant="l2">
       <div id="l1" role="option">A</div>
@@ -110,7 +110,7 @@ TEST_F('CvoxAriaUtilUnitTest', 'ListIndexAndState', function() {
       eqJSON([['list_position', 1, 3]]));
 });
 
-TEST_F('CvoxAriaUtilUnitTest', 'GetLiveRegions', function() {
+TEST_F('ChromeVoxAriaUtilUnitTest', 'GetLiveRegions', function() {
   this.loadDoc(function() {/*!
    <div id="outer">
     <div id="progress" role="progressbar" aria-live="polite" aria-valuenow="1">
diff --git a/chrome/browser/resources/chromeos/chromevox/common/braille_text_handler_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/braille_text_handler_test.unitjs
index 3f53422bd38c4e..61a00af20de0cb 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/braille_text_handler_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/braille_text_handler_test.unitjs
@@ -39,9 +39,9 @@ FakeNavigationManager.prototype = {
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxBrailleTextHandlerUnitTest() {}
+function ChromeVoxBrailleTextHandlerUnitTest() {}
 
-CvoxBrailleTextHandlerUnitTest.prototype = {
+ChromeVoxBrailleTextHandlerUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -61,7 +61,7 @@ CvoxBrailleTextHandlerUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxBrailleTextHandlerUnitTest', 'UpdateByUser', function() {
+TEST_F('ChromeVoxBrailleTextHandlerUnitTest', 'UpdateByUser', function() {
   var navBraille = new cvox.NavBraille({ text: 'Hello, world!' });
   this.navigationManager.setNavBraille(navBraille);
 
diff --git a/chrome/browser/resources/chromeos/chromevox/common/braille_util_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/braille_util_test.unitjs
index 44ef24fc4f36f2..4cff1f3df658e9 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/braille_util_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/braille_util_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxBrailleUtilUnitTest() {}
+function ChromeVoxBrailleUtilUnitTest() {}
 
-CvoxBrailleUtilUnitTest.prototype = {
+ChromeVoxBrailleUtilUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -64,7 +64,7 @@ CvoxBrailleUtilUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxBrailleUtilUnitTest', 'BrailleName', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'BrailleName', function() {
   this.loadHtml(
       '<div id="navbar">' +
       '<a id="1" href="one.com">one</a>' +
@@ -111,7 +111,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'BrailleName', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'NameTemplate', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'NameTemplate', function() {
   this.loadHtml(
       '<button id="1">Submit</button>' +
       '<input id="2" type="text" aria-label="Search">'
@@ -146,7 +146,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'NameTemplate', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'TextField', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'TextField', function() {
   this.loadHtml(
       '<input id="1" type="text" aria-label="Search" value="larry">'
       );
@@ -175,7 +175,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'TextField', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'TextFieldEmpty', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'TextFieldEmpty', function() {
   this.loadHtml(
       '<input id="1" type="text">'
       );
@@ -200,7 +200,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'TextFieldEmpty', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'TextFieldSelection', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'TextFieldSelection', function() {
   this.loadHtml(
       '<input id="1" type="text" value="strawberry">'
       );
@@ -232,7 +232,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'TextFieldSelection', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'StateTemplate', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'StateTemplate', function() {
   this.loadHtml(
       '<input id="1" type="checkbox" aria-label="Save">');
 
@@ -257,7 +257,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'StateTemplate', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'AccessKey', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'AccessKey', function() {
   this.loadHtml(
       '<a href="http://www.google.com" id="1" accesskey="g">Google</a>');
 
@@ -274,7 +274,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'AccessKey', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'ContainerTemplate', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'ContainerTemplate', function() {
   this.loadHtml(
       '<h1>' +
       '<a id="1" href="#menu">Skip To Menu</a>' +
@@ -296,7 +296,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'ContainerTemplate', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'LinkSpans', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'LinkSpans', function() {
   this.loadHtml('<p><a id="1" href="#1">Hello</a> from' +
       ' <a id="2" href="//www.google.com/">ChromeVox</a>');
   var link1 = $('1');
@@ -314,7 +314,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'LinkSpans', function() {
 });
 
 
-TEST_F('CvoxBrailleUtilUnitTest', 'VisitedLink', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'VisitedLink', function() {
   this.loadHtml('<p><a id="1" href="http://visited.link">Hello</a> there.');
   var link = $('1');
   var navBraille = this.getBraille_(
@@ -336,7 +336,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'VisitedLink', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'NestedElements', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'NestedElements', function() {
   this.loadHtml('<h1 id="test-h1">Larry, ' +
       '<a href="#batman" id="batman-link">Sergey</a> and Eric</h1>');
   var h1 = $('test-h1');
@@ -355,7 +355,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'NestedElements', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'GetTemplatedOverride', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'GetTemplatedOverride', function() {
   assertEquals('Menu mnu',
                cvox.BrailleUtil.getTemplated(null, null,
                                              { 'name': 'Menu',
@@ -381,7 +381,7 @@ TEST_F('CvoxBrailleUtilUnitTest', 'GetTemplatedOverride', function() {
 /**
  * @export
  */
-TEST_F('CvoxBrailleUtilUnitTest', 'CreateValue', function() {
+TEST_F('ChromeVoxBrailleUtilUnitTest', 'CreateValue', function() {
   var s;
   var valueSpan;
   var selectiponSpan;
diff --git a/chrome/browser/resources/chromeos/chromevox/common/command_store_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/command_store_test.unitjs
index a1f9cfdc2bcf00..0d8ffefe220039 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/command_store_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/command_store_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxCommandStoreUnitTest() {}
+function ChromeVoxCommandStoreUnitTest() {}
 
-CvoxCommandStoreUnitTest.prototype = {
+ChromeVoxCommandStoreUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -22,7 +22,7 @@ CvoxCommandStoreUnitTest.prototype = {
   ]
 };
 
-TEST_F('CvoxCommandStoreUnitTest', 'TableData', function() {
+TEST_F('ChromeVoxCommandStoreUnitTest', 'TableData', function() {
   var categories = cvox.CommandStore.categories();
   assertEquals(11, categories.length);
   assertEquals('modifier_keys', categories[0]);
@@ -52,7 +52,7 @@ TEST_F('CvoxCommandStoreUnitTest', 'TableData', function() {
 
 
 /** Tests that undefined is returned for bad queries. */
-TEST_F('CvoxCommandStoreUnitTest', 'InvalidQueries', function() {
+TEST_F('ChromeVoxCommandStoreUnitTest', 'InvalidQueries', function() {
   assertThat(cvox.CommandStore.commandsForCategory('foo'), eqJSON([]));
   assertTrue(undefined == cvox.CommandStore.categoryForCommand('foo'));
   assertTrue(undefined == cvox.CommandStore.messageForCommand('foo'));
@@ -60,7 +60,7 @@ TEST_F('CvoxCommandStoreUnitTest', 'InvalidQueries', function() {
 
 
 /** Tests the validity of every command. */
-TEST_F('CvoxCommandStoreUnitTest', 'CommandValidity', function() {
+TEST_F('ChromeVoxCommandStoreUnitTest', 'CommandValidity', function() {
   var categories = cvox.CommandStore.categories();
   for (var i = 0; i < categories.length; i++) {
     var commands = cvox.CommandStore.commandsForCategory(categories[i]);
diff --git a/chrome/browser/resources/chromeos/chromevox/common/content_editable_extractor_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/content_editable_extractor_test.unitjs
index c5f0fa3ba5757b..1dabf7d32181d5 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/content_editable_extractor_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/content_editable_extractor_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxContentEditableExtractorUnitTest() {}
+function ChromeVoxContentEditableExtractorUnitTest() {}
 
-CvoxContentEditableExtractorUnitTest.prototype = {
+ChromeVoxContentEditableExtractorUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -37,7 +37,7 @@ function setSelection(startNode, startOffset, endNode, endOffset) {
   sel.addRange(r);
 }
 
-TEST_F('CvoxContentEditableExtractorUnitTest', 'EmptyElement', function() {
+TEST_F('ChromeVoxContentEditableExtractorUnitTest', 'EmptyElement', function() {
   this.loadDoc(function() {/*!
     <div>
       <div id="textbox" contentEditable="true"></div>
@@ -58,7 +58,8 @@ TEST_F('CvoxContentEditableExtractorUnitTest', 'EmptyElement', function() {
 /**
  * Test getting text and selections from a single contenteditable node.
  */
-TEST_F('CvoxContentEditableExtractorUnitTest', 'SingleTextNode', function() {
+TEST_F('ChromeVoxContentEditableExtractorUnitTest', 'SingleTextNode',
+       function() {
   this.loadDoc(function() {/*!
     <div>
       <div id="textbox" contentEditable="true">Hello</div>
@@ -102,7 +103,7 @@ TEST_F('CvoxContentEditableExtractorUnitTest', 'SingleTextNode', function() {
  * Test getting text and selections from a contenteditable node with
  * nonprinted whitespace.
  */
-TEST_F('CvoxContentEditableExtractorUnitTest', 'TextWithWhitespace',
+TEST_F('ChromeVoxContentEditableExtractorUnitTest', 'TextWithWhitespace',
     function() {
   this.loadDoc(function() {/*!
     <div>
@@ -152,7 +153,7 @@ TEST_F('CvoxContentEditableExtractorUnitTest', 'TextWithWhitespace',
  * Test getting text and selections from a contenteditable node with
  * preformatted text.
  */
-TEST_F('CvoxContentEditableExtractorUnitTest', 'Preformatted', function() {
+TEST_F('ChromeVoxContentEditableExtractorUnitTest', 'Preformatted', function() {
   this.loadDoc(function() {/*!
     <div>
       <pre id="textbox" contentEditable="true">aaaaaaaaaa
@@ -185,7 +186,7 @@ cccccccccc</pre>
  * Test getting text and selections from a contenteditable node with
  * wrapping.
  */
-TEST_F('CvoxContentEditableExtractorUnitTest', 'WordWrap', function() {
+TEST_F('ChromeVoxContentEditableExtractorUnitTest', 'WordWrap', function() {
   this.loadDoc(function() {/*!
     <div>
       <div id="textbox"
@@ -218,7 +219,7 @@ TEST_F('CvoxContentEditableExtractorUnitTest', 'WordWrap', function() {
  * Test getting text and lines from a contenteditable region
  * containing two paragraphs and an explicit line break.
  */
-TEST_F('CvoxContentEditableExtractorUnitTest', 'TwoParas', function() {
+TEST_F('ChromeVoxContentEditableExtractorUnitTest', 'TwoParas', function() {
   this.loadDoc(function() {/*!
     <div>
       <div id="textbox" contentEditable="true">
@@ -245,7 +246,7 @@ TEST_F('CvoxContentEditableExtractorUnitTest', 'TwoParas', function() {
  * Test getting text and lines from a contenteditable region
  * containing two paragraphs, this time with added whitespace.
  */
-TEST_F('CvoxContentEditableExtractorUnitTest', 'TwoParasWithWhitespace',
+TEST_F('ChromeVoxContentEditableExtractorUnitTest', 'TwoParasWithWhitespace',
     function() {
   this.loadDoc(function() {/*!
     <div>
@@ -273,7 +274,8 @@ TEST_F('CvoxContentEditableExtractorUnitTest', 'TwoParasWithWhitespace',
  * Test getting text and lines from a contenteditable region
  * containing some raw text and then some text in a block-level element.
  */
-TEST_F('CvoxContentEditableExtractorUnitTest', 'NodePlusElement', function() {
+TEST_F('ChromeVoxContentEditableExtractorUnitTest', 'NodePlusElement',
+       function() {
   this.loadDoc(function() {/*!
     <div>
       <div id="textbox"
diff --git a/chrome/browser/resources/chromeos/chromevox/common/cursor_selection_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/cursor_selection_test.unitjs
index d4a72beba4a5b7..9a3663ced4bdf3 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/cursor_selection_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/cursor_selection_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxCursorSelectionUnitTest() {}
+function ChromeVoxCursorSelectionUnitTest() {}
 
-CvoxCursorSelectionUnitTest.prototype = {
+ChromeVoxCursorSelectionUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -21,7 +21,7 @@ CvoxCursorSelectionUnitTest.prototype = {
   ]
 };
 
-TEST_F('CvoxCursorSelectionUnitTest', 'Reverse', function() {
+TEST_F('ChromeVoxCursorSelectionUnitTest', 'Reverse', function() {
   this.loadDoc(function() {/*!
      <div>
        <p id="a">a</p>
@@ -65,7 +65,7 @@ TEST_F('CvoxCursorSelectionUnitTest', 'Reverse', function() {
 
 
 /** Tests correctness of collapsing selections.  */
-TEST_F('CvoxCursorSelectionUnitTest', 'Collapse', function() {
+TEST_F('ChromeVoxCursorSelectionUnitTest', 'Collapse', function() {
   this.loadDoc(function() {/*!
     <p id='1'>This is a test.</p>
   */});
diff --git a/chrome/browser/resources/chromeos/chromevox/common/dom_util_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/dom_util_test.unitjs
index b77b36676fa5b7..1ac68766116d3a 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/dom_util_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/dom_util_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxDomUtilUnitTest() {}
+function ChromeVoxDomUtilUnitTest() {}
 
-CvoxDomUtilUnitTest.prototype = {
+ChromeVoxDomUtilUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -101,7 +101,7 @@ CvoxDomUtilUnitTest.prototype = {
   },
 };
 
-TEST_F('CvoxDomUtilUnitTest', 'IsVisible', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'IsVisible', function() {
   this.loadDomUtilTestDoc_();
 
   // Simple tests.
@@ -150,7 +150,7 @@ TEST_F('CvoxDomUtilUnitTest', 'IsVisible', function() {
 });
 
 /** Test determining if a node is a leaf node or not. @export */
-TEST_F('CvoxDomUtilUnitTest', 'IsLeafNode', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'IsLeafNode', function() {
   this.loadDomUtilTestDoc_();
 
   var node = $('normal_node');
@@ -180,7 +180,7 @@ TEST_F('CvoxDomUtilUnitTest', 'IsLeafNode', function() {
 });
 
 /** Test determining if a node has content or not. @export */
-TEST_F('CvoxDomUtilUnitTest', 'HasContent', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'HasContent', function() {
   this.loadDomUtilTestDoc_();
 
   var node = $('normal_node');
@@ -220,7 +220,7 @@ TEST_F('CvoxDomUtilUnitTest', 'HasContent', function() {
 });
 
 /** Test getting a node's state. @export */
-TEST_F('CvoxDomUtilUnitTest', 'NodeState', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'NodeState', function() {
   this.loadDomUtilTestDoc_();
   this.appendDoc(function() {/*!
   <input id="state1_enabled">
@@ -271,7 +271,7 @@ TEST_F('CvoxDomUtilUnitTest', 'NodeState', function() {
 });
 
 /** Test finding the next/previous leaf node. @export */
-TEST_F('CvoxDomUtilUnitTest', 'LeafNodeTraversal', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'LeafNodeTraversal', function() {
   this.loadDomUtilTestDoc_();
 
   var node = $('a');
@@ -290,7 +290,7 @@ TEST_F('CvoxDomUtilUnitTest', 'LeafNodeTraversal', function() {
 });
 
 /** Test finding the label for controls. @export */
-TEST_F('CvoxDomUtilUnitTest', 'GetLabel', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'GetLabel', function() {
   this.loadDoc(function() {/*!
     <fieldset id="Fieldset">
     <legend>This is a legend inside a fieldset</legend>
@@ -357,7 +357,7 @@ TEST_F('CvoxDomUtilUnitTest', 'GetLabel', function() {
 });
 
 /** Test finding the label for controls with a more complex setup. @export */
-TEST_F('CvoxDomUtilUnitTest', 'GetLabelComplex', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'GetLabelComplex', function() {
   this.loadDoc(function() {/*!
   <table class="bug-report-table">
   <tbody><tr>
@@ -413,7 +413,7 @@ TEST_F('CvoxDomUtilUnitTest', 'GetLabelComplex', function() {
 
 /**************************************************************/
 
-TEST_F('CvoxDomUtilUnitTest', 'EscapedNames', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'EscapedNames', function() {
   this.loadDoc(function() {/*!
      <p id="en-title" title="&lt;&gt;"></p>
      <p id="en-arialabel" aria-label="&lt;&gt;"></p>
@@ -431,7 +431,7 @@ TEST_F('CvoxDomUtilUnitTest', 'EscapedNames', function() {
 });
 
 /** Test a paragraph with plain text. @export */
-TEST_F('CvoxDomUtilUnitTest', 'SimplePara', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'SimplePara', function() {
   this.loadDoc(function() {/*!
     <p id="simplepara">This is a simple paragraph.</p>
   */});
@@ -441,7 +441,7 @@ TEST_F('CvoxDomUtilUnitTest', 'SimplePara', function() {
 });
 
 /** Test a paragraph with nested tags. @export */
-TEST_F('CvoxDomUtilUnitTest', 'NestedPara', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'NestedPara', function() {
   this.loadDoc(function() {/*!
     <p id="nestedpara">This is a <b>paragraph</b> with <i>nested</i> tags.</p>
   */});
@@ -454,7 +454,7 @@ TEST_F('CvoxDomUtilUnitTest', 'NestedPara', function() {
  * Test a paragraph with nested tags and varying visibility.
  * @export
  */
-TEST_F('CvoxDomUtilUnitTest', 'NestedVisibilityPara', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'NestedVisibilityPara', function() {
   this.loadDoc(function() {/*!
     <style type="text/css">
       #nested_visibility_paragraph { }
@@ -475,7 +475,7 @@ TEST_F('CvoxDomUtilUnitTest', 'NestedVisibilityPara', function() {
 });
 
 /** Test getting text from an IMG node. @export */
-TEST_F('CvoxDomUtilUnitTest', 'Image', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'Image', function() {
   this.loadDoc(function() {/*!
     <img id="img">
     <img id="img_noalt" src="rose.png">
@@ -498,7 +498,7 @@ TEST_F('CvoxDomUtilUnitTest', 'Image', function() {
 });
 
 /** Test getting text from a select box. @export */
-TEST_F('CvoxDomUtilUnitTest', 'Select', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'Select', function() {
   this.loadDoc(function() {/*!
     <select id="select_noneselected">
       <option>Apple</option>
@@ -520,7 +520,7 @@ TEST_F('CvoxDomUtilUnitTest', 'Select', function() {
 });
 
 /** Test whether funky html causes getName to go into infinite loop. */
-TEST_F('CvoxDomUtilUnitTest', 'GetNameInfiniteLoop', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'GetNameInfiniteLoop', function() {
   this.loadDoc(function() {/*!
     <div>
       <label for="a">
@@ -535,7 +535,7 @@ TEST_F('CvoxDomUtilUnitTest', 'GetNameInfiniteLoop', function() {
 });
 
 /** Test getting text from an INPUT control. @export */
-TEST_F('CvoxDomUtilUnitTest', 'Input', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'Input', function() {
   this.loadDoc(function() {/*!
     <form action="">
       <input id="hidden" type="hidden" value="hidden1">
@@ -599,7 +599,7 @@ TEST_F('CvoxDomUtilUnitTest', 'Input', function() {
 
 
 /** Test checking if something is a control. @export */
-TEST_F('CvoxDomUtilUnitTest', 'IsControl', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'IsControl', function() {
   this.loadDoc(function() {/*!
   <table width="100%" border="0" cellpadding="0" cellspacing="0">
     <tbody>
@@ -1000,7 +1000,7 @@ TEST_F('CvoxDomUtilUnitTest', 'IsControl', function() {
 });
 
 /** Test if something is an ARIA control. @export */
-TEST_F('CvoxDomUtilUnitTest', 'IsAriaControl', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'IsAriaControl', function() {
   this.loadDoc(function() {/*!
   <li id="cb1" role="checkbox" tabindex="0" aria-checked="false"
   aria-describedby="cond desc1">
@@ -1022,7 +1022,7 @@ TEST_F('CvoxDomUtilUnitTest', 'IsAriaControl', function() {
 });
 
 /** Test if something is an focusable. @export */
-TEST_F('CvoxDomUtilUnitTest', 'IsFocusable', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'IsFocusable', function() {
   this.loadDoc(function() {/*!
   <a id="focus_link" href="#">Link</a>
   <a id="focus_anchor">Unfocusable anchor</a>
@@ -1075,7 +1075,7 @@ TEST_F('CvoxDomUtilUnitTest', 'IsFocusable', function() {
 });
 
 /** Some additional tests for getName function. */
-TEST_F('CvoxDomUtilUnitTest', 'GetName', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'GetName', function() {
   this.loadDoc(function() {/*!
   <span id="test-span" aria-labelledby="fake-id">Some text</span>
   <label id="label1">One</label>
@@ -1092,7 +1092,7 @@ TEST_F('CvoxDomUtilUnitTest', 'GetName', function() {
 });
 
 /** Test for getLinkURL. */
-TEST_F('CvoxDomUtilUnitTest', 'GetLinkURL', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'GetLinkURL', function() {
   this.loadDoc(function() {/*!
   <a id="l1" name="nohref">Anchor</a>
   <a id="l2" href="">Empty link</a>
@@ -1116,7 +1116,7 @@ TEST_F('CvoxDomUtilUnitTest', 'GetLinkURL', function() {
 });
 
 /** Test for isDisabled. */
-TEST_F('CvoxDomUtilUnitTest', 'IsDisabled', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'IsDisabled', function() {
   this.loadDoc(function() {/*!
   <input id="button1" type="button" value="Press me!"/>
   <input id="button2" type="button" value="Don't touch me!" disabled/>
@@ -1128,7 +1128,7 @@ TEST_F('CvoxDomUtilUnitTest', 'IsDisabled', function() {
 });
 
 /** Test for a tree with aria-expanded attribute. */
-TEST_F('CvoxDomUtilUnitTest', 'Tree', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'Tree', function() {
   this.loadDoc(function() {/*!
   <div id=":0" role="tree" aria-selected="false" aria-expanded="true"
     aria-level="0" aria-labelledby=":0.label" tabindex="0"
@@ -1188,7 +1188,7 @@ TEST_F('CvoxDomUtilUnitTest', 'Tree', function() {
 });
 
 /** Test for tables with different border specifications */
-TEST_F('CvoxDomUtilUnitTest', 'TableBorders', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'TableBorders', function() {
   this.loadDoc(function() {/*!
   <table id=":0" border="1">
     <tr>
@@ -1289,7 +1289,7 @@ TEST_F('CvoxDomUtilUnitTest', 'TableBorders', function() {
 });
 
 /** Tests for shallowChildlessClone */
-TEST_F('CvoxDomUtilUnitTest', 'ShallowChildlessClone', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'ShallowChildlessClone', function() {
   this.loadDoc(function() {/*!
     <div id='simple'>asdf</div>
     <div id='expectedSimpleClone'>asdf</div>
@@ -1317,7 +1317,7 @@ TEST_F('CvoxDomUtilUnitTest', 'ShallowChildlessClone', function() {
 });
 
 /** Tests for deepClone */
-TEST_F('CvoxDomUtilUnitTest', 'DeepClone', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'DeepClone', function() {
   this.loadDoc(function() {/*!
     <div id='simple'>asdf</div>
   */});
@@ -1332,7 +1332,7 @@ TEST_F('CvoxDomUtilUnitTest', 'DeepClone', function() {
 });
 
 /** Tests for findNode */
-TEST_F('CvoxDomUtilUnitTest', 'FindNode', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'FindNode', function() {
   this.loadDoc(function() {/*!
     <div id="root">
       <p id="a">a</p>
@@ -1345,7 +1345,7 @@ TEST_F('CvoxDomUtilUnitTest', 'FindNode', function() {
 });
 
 /** Tests for getState for a list */
-TEST_F('CvoxDomUtilUnitTest', 'ListLength', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'ListLength', function() {
   this.loadDoc(function() {/*!
     <ul id="ul1">
       <li>A
@@ -1368,7 +1368,7 @@ TEST_F('CvoxDomUtilUnitTest', 'ListLength', function() {
 });
 
 /** Tests for hasLongDesc */
-TEST_F('CvoxDomUtilUnitTest', 'HasLongDesc', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'HasLongDesc', function() {
   this.loadDoc(function() {/*!
     <img id="img0" longdesc="desc.html" src="img0.jpg"></img>
     <img id="img1" src="img1.jpg"></img>
@@ -1381,7 +1381,7 @@ TEST_F('CvoxDomUtilUnitTest', 'HasLongDesc', function() {
 });
 
 /** Tests for various link leaf types. */
-TEST_F('CvoxDomUtilUnitTest', 'LinkLeaf', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'LinkLeaf', function() {
   this.loadDoc(function() {/*!
     <a id='leaf' href='google.com'><strong>Click</strong><div>here</div></a>
     <a id='non-leaf' href='google.com'>Click <h2>here</h2></a>
@@ -1394,7 +1394,7 @@ TEST_F('CvoxDomUtilUnitTest', 'LinkLeaf', function() {
 
 
 /** Test the value and state of a multiple select. */
-TEST_F('CvoxDomUtilUnitTest', 'MultipleSelectValue', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'MultipleSelectValue', function() {
   this.loadDoc(function() {/*!
     <select id='cars' multiple>
       <option value="volvo">Volvo</option>
@@ -1415,7 +1415,7 @@ TEST_F('CvoxDomUtilUnitTest', 'MultipleSelectValue', function() {
  * Absolute positioning of the container is used to avoid the window of the
  * browser being too small to contain the test elements.
  */
-TEST_F('CvoxDomUtilUnitTest', 'ElementToPoint', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'ElementToPoint', function() {
   this.loadDoc(function() {/*!
     <div style="position: absolute; top: 0; left: 0">
       <a id='one' href='#a'>First</a>
@@ -1438,7 +1438,7 @@ TEST_F('CvoxDomUtilUnitTest', 'ElementToPoint', function() {
 });
 
 /** Tests we compute the correct name for hidden aria labelledby nodes. */
-TEST_F('CvoxDomUtilUnitTest', 'HiddenAriaLabelledby', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'HiddenAriaLabelledby', function() {
   this.loadDoc(function() {/*!
     <span id="acc_name" style="display: none">
       hello world!
@@ -1450,7 +1450,7 @@ TEST_F('CvoxDomUtilUnitTest', 'HiddenAriaLabelledby', function() {
 });
 
 /** Tests that we compute the correct state for accesskeys. */
-TEST_F('CvoxDomUtilUnitTest', 'AccessKey', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'AccessKey', function() {
   this.loadDoc(function() {/*!
     <a id='accessKey' href="#f" title="Next page" accesskey="n">Next page</a>
   */});
@@ -1460,7 +1460,7 @@ TEST_F('CvoxDomUtilUnitTest', 'AccessKey', function() {
 
 
 /** Tests that we compute the correct name for ordered listitems. */
-TEST_F('CvoxDomUtilUnitTest', 'OrderedListitem', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'OrderedListitem', function() {
   this.loadDoc(function() {/*!
     <ol id="fruits_ol">
       <li id='ol_li1'>apple
@@ -1497,7 +1497,7 @@ TEST_F('CvoxDomUtilUnitTest', 'OrderedListitem', function() {
 });
 
 /** Tests a node with title, and textContent containing only whitespace. */
-TEST_F('CvoxDomUtilUnitTest', 'TitleOverridesInnerWhitespace', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'TitleOverridesInnerWhitespace', function() {
   this.loadDoc(function() {/*!
     <button id="btn1" title="Remove from Chrome">
       <span class="lid"></span>
@@ -1509,7 +1509,7 @@ TEST_F('CvoxDomUtilUnitTest', 'TitleOverridesInnerWhitespace', function() {
 });
 
 /** Test memoization. **/
-TEST_F('CvoxDomUtilUnitTest', 'Memoization', function() {
+TEST_F('ChromeVoxDomUtilUnitTest', 'Memoization', function() {
   this.loadDoc(function() {/*!
     <div id="container">
     </div>
diff --git a/chrome/browser/resources/chromeos/chromevox/common/editable_text_area_shadow_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/editable_text_area_shadow_test.unitjs
index ce874225246113..075aa69b03fc09 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/editable_text_area_shadow_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/editable_text_area_shadow_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxShadowUnitTest() {}
+function ChromeVoxShadowUnitTest() {}
 
-CvoxShadowUnitTest.prototype = {
+ChromeVoxShadowUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -21,7 +21,7 @@ CvoxShadowUnitTest.prototype = {
   ]
 };
 
-TEST_F('CvoxShadowUnitTest', 'MultilineLines', function() {
+TEST_F('ChromeVoxShadowUnitTest', 'MultilineLines', function() {
   this.loadDoc(function() {/*!
     <div><textarea id="area">
 one
@@ -51,7 +51,7 @@ three
  * Test disabled due to not being reliable if font size changes.
  * See https://codereview.chromium.org/549303004/
  */
-TEST_F('CvoxShadowUnitTest', 'DISABLED_MultilineWrap', function() {
+TEST_F('ChromeVoxShadowUnitTest', 'DISABLED_MultilineWrap', function() {
   this.loadDoc(function() {/*!
     <div><textarea id="area"
           cols=4 rows=20>One two thr fou fiv six sev eig</textarea>
diff --git a/chrome/browser/resources/chromeos/chromevox/common/editable_text_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/editable_text_test.unitjs
index 7a78aa1c6e13b2..c72d7d599cd7b4 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/editable_text_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/editable_text_test.unitjs
@@ -88,9 +88,9 @@ TestBraille.assertContent = function(text, opt_start, opt_end) {
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxEditableTextUnitTest() {}
+function ChromeVoxEditableTextUnitTest() {}
 
-CvoxEditableTextUnitTest.prototype = {
+ChromeVoxEditableTextUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -174,7 +174,7 @@ CvoxEditableTextUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxEditableTextUnitTest', 'CursorNavigation', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'CursorNavigation', function() {
   var tts = new TestTts();
   var obj = new cvox.ChromeVoxEditableTextBase('Hello', 0, 0, false, tts);
 
@@ -193,7 +193,7 @@ TEST_F('CvoxEditableTextUnitTest', 'CursorNavigation', function() {
 });
 
 /** Test typing words. */
-TEST_F('CvoxEditableTextUnitTest', 'TypingWords', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'TypingWords', function() {
   var tts = new TestTts();
   var obj = new cvox.ChromeVoxEditableTextBase('', 0, 0, false, tts);
   obj.changed(new cvox.TextChangeEvent('H', 1, 1));
@@ -252,7 +252,7 @@ TEST_F('CvoxEditableTextUnitTest', 'TypingWords', function() {
 });
 
 /** Test selection. */
-TEST_F('CvoxEditableTextUnitTest', 'Selection', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'Selection', function() {
   var tts = new TestTts();
   var obj =
       new cvox.ChromeVoxEditableTextBase('Hello, world.', 0, 0, false, tts);
@@ -285,7 +285,7 @@ TEST_F('CvoxEditableTextUnitTest', 'Selection', function() {
 
 
 /** Test multi-line text. */
-TEST_F('CvoxEditableTextUnitTest', 'MultiLineText', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'MultiLineText', function() {
   var str = 'This string\nspans\nfive lines.\n  \n';
   var tts = new TestTts();
   var obj = new cvox.ChromeVoxEditableElement(null, str, 0, 0, false, tts);
@@ -345,7 +345,7 @@ TEST_F('CvoxEditableTextUnitTest', 'MultiLineText', function() {
  * address bar, and it's being autocompleted. Sometimes it's autocompleted
  * as they type, sometimes there's a short delay.
  */
-TEST_F('CvoxEditableTextUnitTest', 'Autocomplete', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'Autocomplete', function() {
   var tts = new TestTts();
   var obj = new cvox.ChromeVoxEditableTextBase('', 0, 0, false, tts);
 
@@ -395,7 +395,7 @@ TEST_F('CvoxEditableTextUnitTest', 'Autocomplete', function() {
 /**
  * Test a few common scenarios where text is replaced.
  */
-TEST_F('CvoxEditableTextUnitTest', 'ReplacingText', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'ReplacingText', function() {
   // Initial value is Alabama.
   var tts = new TestTts();
   var obj = new cvox.ChromeVoxEditableTextBase('Alabama', 0, 0, false, tts);
@@ -434,7 +434,7 @@ TEST_F('CvoxEditableTextUnitTest', 'ReplacingText', function() {
 /**
  * Test feedback when text changes in a long sentence.
  */
-TEST_F('CvoxEditableTextUnitTest', 'ReplacingLongText', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'ReplacingLongText', function() {
   var tts = new TestTts();
   var obj = new cvox.ChromeVoxEditableTextBase(
     'I love deadlines. I like the whooshing sound they make as they fly by.',
@@ -449,7 +449,7 @@ TEST_F('CvoxEditableTextUnitTest', 'ReplacingLongText', function() {
 });
 
 /** Tests character echo. */
-TEST_F('CvoxEditableTextUnitTest', 'CharacterEcho', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'CharacterEcho', function() {
   cvox.ChromeVox.typingEcho = cvox.TypingEcho.CHARACTER;
   var tts = new TestTts();
   var obj = new cvox.ChromeVoxEditableTextBase('', 0, 0, false, tts);
@@ -473,7 +473,7 @@ TEST_F('CvoxEditableTextUnitTest', 'CharacterEcho', function() {
 
 
 /** Tests word echo. */
-TEST_F('CvoxEditableTextUnitTest', 'WordEcho', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'WordEcho', function() {
   cvox.ChromeVox.typingEcho = cvox.TypingEcho.WORD;
   var tts = new TestTts();
   var obj = new cvox.ChromeVoxEditableTextBase('', 0, 0, false, tts);
@@ -497,7 +497,7 @@ TEST_F('CvoxEditableTextUnitTest', 'WordEcho', function() {
 
 
 /** Tests no echo. */
-TEST_F('CvoxEditableTextUnitTest', 'NoEcho', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'NoEcho', function() {
   cvox.ChromeVox.typingEcho = cvox.TypingEcho.NONE;
   var tts = new TestTts();
   var obj = new cvox.ChromeVoxEditableTextBase('', 0, 0, false, tts);
@@ -520,7 +520,8 @@ TEST_F('CvoxEditableTextUnitTest', 'NoEcho', function() {
 });
 
 /** Tests cursor movement in an input field by character. */
-TEST_F('CvoxEditableTextUnitTest', 'CursorMovementByCharacter', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'CursorMovementByCharacter',
+       function() {
   var test = this.setUpForCursorTest_('input');
   var editable = test.editable, prepare = test.prepare, expect = test.expect;
   try {
@@ -549,7 +550,7 @@ TEST_F('CvoxEditableTextUnitTest', 'CursorMovementByCharacter', function() {
 });
 
 /** Tests cursor movement in an input field by word. */
-TEST_F('CvoxEditableTextUnitTest', 'CursorMovementByWord', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'CursorMovementByWord', function() {
   var test = this.setUpForCursorTest_('input');
   var editable = test.editable, prepare = test.prepare, expect = test.expect;
   try {
@@ -584,7 +585,7 @@ TEST_F('CvoxEditableTextUnitTest', 'CursorMovementByWord', function() {
 });
 
 /** Tests that character and word movement still work in <textarea>. */
-TEST_F('CvoxEditableTextUnitTest', 'CursorMovementTextArea', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'CursorMovementTextArea', function() {
   var test = this.setUpForCursorTest_('textarea');
   var editable = test.editable, prepare = test.prepare, expect = test.expect;
   try {
@@ -609,7 +610,7 @@ TEST_F('CvoxEditableTextUnitTest', 'CursorMovementTextArea', function() {
 });
 
 /** Tests that line navigation works. */
-TEST_F('CvoxEditableTextUnitTest', 'CursorMovementByLine', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'CursorMovementByLine', function() {
   var test = this.setUpForCursorTest_('textarea');
   var editable = test.editable, prepare = test.prepare, expect = test.expect;
   try {
@@ -644,7 +645,7 @@ TEST_F('CvoxEditableTextUnitTest', 'CursorMovementByLine', function() {
 });
 
 /** Tests that paragraph navigation works. */
-TEST_F('CvoxEditableTextUnitTest', 'CursorMovementByParagraph', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'CursorMovementByParagraph', function() {
   var test = this.setUpForCursorTest_('textarea');
   var editable = test.editable, prepare = test.prepare, expect = test.expect;
   try {
@@ -667,7 +668,7 @@ TEST_F('CvoxEditableTextUnitTest', 'CursorMovementByParagraph', function() {
 });
 
 /** Tests normalization of TextChangeEvent's */
-TEST_F('CvoxEditableTextUnitTest', 'TextChangeEvent', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'TextChangeEvent', function() {
   var event1 = new cvox.TextChangeEvent('foo', 0, 1, true);
   var event2 = new cvox.TextChangeEvent('foo', 1, 0, true);
   var event3 = new cvox.TextChangeEvent('foo', 1, 1, true);
@@ -682,7 +683,7 @@ TEST_F('CvoxEditableTextUnitTest', 'TextChangeEvent', function() {
   assertEquals(1, event3.end);
 });
 
-TEST_F('CvoxEditableTextUnitTest', 'ContentEditableBraille', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'ContentEditableBraille', function() {
   this.loadDoc(function() {/*!
     <div id='1' contenteditable='true'>
       Some &nbsp; text.<br><br>
@@ -704,7 +705,7 @@ TEST_F('CvoxEditableTextUnitTest', 'ContentEditableBraille', function() {
   TestBraille.assertContent('', 0, 0);
 });
 
-TEST_F('CvoxEditableTextUnitTest', 'TypingNonBreakingSpaces', function() {
+TEST_F('ChromeVoxEditableTextUnitTest', 'TypingNonBreakingSpaces', function() {
   var tts = new TestTts();
   var obj = new cvox.ChromeVoxEditableTextBase('Hello', 0, 0, false, tts);
 
diff --git a/chrome/browser/resources/chromeos/chromevox/common/find_util_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/find_util_test.unitjs
index 707fdcb331ec65..62651c7da458c3 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/find_util_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/find_util_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxFindUtilUnitTest() {}
+function ChromeVoxFindUtilUnitTest() {}
 
-CvoxFindUtilUnitTest.prototype = {
+ChromeVoxFindUtilUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -21,7 +21,7 @@ CvoxFindUtilUnitTest.prototype = {
   ]
 };
 
-TEST_F('CvoxFindUtilUnitTest', 'Links', function() {
+TEST_F('ChromeVoxFindUtilUnitTest', 'Links', function() {
   this.loadDoc(function() {/*!
     <div>
       <p id="before">Before</p>
diff --git a/chrome/browser/resources/chromeos/chromevox/common/key_sequence_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/key_sequence_test.unitjs
index 077ceebb29401c..512eec3c9ef337 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/key_sequence_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/key_sequence_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxKeySequenceUnitTest() {}
+function ChromeVoxKeySequenceUnitTest() {}
 
-CvoxKeySequenceUnitTest.prototype = {
+ChromeVoxKeySequenceUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -156,7 +156,7 @@ CvoxKeySequenceUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxKeySequenceUnitTest', 'SimpleSequenceNoModifier', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'SimpleSequenceNoModifier', function() {
   var downKey = new cvox.KeySequence(this.downArrowEvent, false);
 
   assertEqualsJSON([40], downKey.keys.keyCode);
@@ -176,7 +176,8 @@ TEST_F('CvoxKeySequenceUnitTest', 'SimpleSequenceNoModifier', function() {
 
 
 /** Test another key sequence, this time with the modifier */
-TEST_F('CvoxKeySequenceUnitTest', 'SimpleSequenceWithModifier', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'SimpleSequenceWithModifier',
+       function() {
   var downKey = new cvox.KeySequence(this.downArrowEvent, true);
 
   assertEqualsJSON([40], downKey.keys.keyCode);
@@ -196,7 +197,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'SimpleSequenceWithModifier', function() {
 
 
 /** Test a key sequence that includes the modifier */
-TEST_F('CvoxKeySequenceUnitTest', 'ModifiedSequence', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'ModifiedSequence', function() {
   var cvoxDownKey = new cvox.KeySequence(this.altDownArrowEvent, true);
 
   assertEqualsJSON([40], cvoxDownKey.keys.keyCode);
@@ -220,7 +221,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'ModifiedSequence', function() {
  * These should be equal because Ctrl should still function even with
  * sticky mode on.
 */
-TEST_F('CvoxKeySequenceUnitTest', 'StickyEquality', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'StickyEquality', function() {
   var ctrlKey = new cvox.KeySequence(this.ctrlEvent, false);
   var ctrlSticky = new cvox.KeySequence(this.ctrlStickyEvent, false);
 
@@ -233,7 +234,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'StickyEquality', function() {
  * modifier.
  * These should not be equal because they do not have the same modifiers.
 */
-TEST_F('CvoxKeySequenceUnitTest', 'ShiftEquality', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'ShiftEquality', function() {
   var aKey = new cvox.KeySequence(this.aEvent, false);
   var shiftA = new cvox.KeySequence(this.shiftAEvent, false);
 
@@ -246,7 +247,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'ShiftEquality', function() {
  * on, 'a' with prefix key, and 'a' with ChromeVox modifier held down. These
  * should all be equal to each other.
  */
-TEST_F('CvoxKeySequenceUnitTest', 'FourWayEquality', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'FourWayEquality', function() {
   var commandSequence = new cvox.KeySequence(this.aEvent, true);
   var stickySequence = new cvox.KeySequence(this.aEventSticky, false);
   var prefixSequence = new cvox.KeySequence(this.aEventPrefix, false);
@@ -276,7 +277,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'FourWayEquality', function() {
  * modifier specified vs. 'a' key with ChromeVox modifier held down.
  * These should all be equal to each other..
 */
-TEST_F('CvoxKeySequenceUnitTest', 'ShiftPrefixEquality', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'ShiftPrefixEquality', function() {
   var shiftAWithModifier = new cvox.KeySequence(this.shiftAEvent, true);
   var shiftAWithPrefix = new cvox.KeySequence(this.shiftAPrefixEvent, false);
   var shiftASticky = new cvox.KeySequence(this.shiftAStickyEvent, false);
@@ -304,7 +305,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'ShiftPrefixEquality', function() {
  * Test inequality - 'a' with modifier key vs. 'a' without modifier key.
  * These should not be equal.
 */
-TEST_F('CvoxKeySequenceUnitTest', 'Inequality', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'Inequality', function() {
   var aNoModifier = new cvox.KeySequence(this.aEvent, false);
   var aWithModifier = new cvox.KeySequence(this.aEvent, true);
 
@@ -316,7 +317,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'Inequality', function() {
 /**
  * Test equality - adding an additional key onto a sequence.
  */
-TEST_F('CvoxKeySequenceUnitTest', 'CvoxCtrl', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'CvoxCtrl', function() {
   var cvoxCtrlSequence = new cvox.KeySequence(this.ctrlEvent, true);
   assertTrue(cvoxCtrlSequence.addKeyEvent(this.rightArrowEvent));
 
@@ -347,7 +348,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'CvoxCtrl', function() {
 /**
  * Test for inequality - key sequences in different orders.
  */
-TEST_F('CvoxKeySequenceUnitTest', 'DifferentSequences', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'DifferentSequences', function() {
   var cvoxBSequence = new cvox.KeySequence(this.bEvent, true);
   assertTrue(cvoxBSequence.addKeyEvent(this.cEvent));
 
@@ -363,7 +364,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'DifferentSequences', function() {
  * Tests modifiers (ctrl, alt, etc) - if two sequences have different modifiers
  * held down then they aren't equal.
  */
-TEST_F('CvoxKeySequenceUnitTest', 'MoreModifiers', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'MoreModifiers', function() {
   var ctrlASequence = new cvox.KeySequence(this.ctrlAEvent, false);
   var ctrlModifierKeyASequence = new cvox.KeySequence(this.ctrlAEvent, true);
 
@@ -381,7 +382,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'MoreModifiers', function() {
  * Tests modifier (ctrl, alt, etc) order - if two sequences have the same
  * modifiers but held down in a different order then they aren't equal.
  */
-TEST_F('CvoxKeySequenceUnitTest', 'ModifierOrder', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'ModifierOrder', function() {
   var ctrlShiftSequence = new cvox.KeySequence(this.ctrlShiftEvent, false);
   var shiftCtrlSequence = new cvox.KeySequence(this.shiftCtrlEvent, true);
 
@@ -392,7 +393,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'ModifierOrder', function() {
 /**
  * Tests converting from a string to a KeySequence object.
  */
-TEST_F('CvoxKeySequenceUnitTest', 'FromStr', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'FromStr', function() {
   var ctrlString = cvox.KeySequence.fromStr('Ctrl');
   assertEqualsJSON(ctrlString.keys.ctrlKey, [true]);
   assertEqualsJSON(ctrlString.keys.keyCode, [17]);
@@ -428,7 +429,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'FromStr', function() {
 /**
  * Tests converting from a JSON string to a KeySequence object.
  */
-TEST_F('CvoxKeySequenceUnitTest', 'Deserialize', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'Deserialize', function() {
   var forwardSequence = cvox.KeySequence.deserialize({'cvoxModifier': true,
       'stickyMode': false, 'prefixKey': false, 'keys': {'ctrlKey': [false],
       'searchKeyHeld': [false], 'altKey': [false], 'altGraphKey': [false],
@@ -444,7 +445,8 @@ TEST_F('CvoxKeySequenceUnitTest', 'Deserialize', function() {
   assertEqualsJSON(ctrlSequence.keys.keyCode, [17]);
 });
 
-TEST_F('CvoxKeySequenceUnitTest', 'DeserializeAltShiftCvoxMod', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'DeserializeAltShiftCvoxMod',
+       function() {
   cvox.ChromeVox.modKeyStr = 'Alt+Shift';
 
   // Build a key sequence that does not strip modifiers when deserializing.
@@ -463,7 +465,8 @@ TEST_F('CvoxKeySequenceUnitTest', 'DeserializeAltShiftCvoxMod', function() {
   assertTrue(prevHeadingSeq.keys.shiftKey[0]);
 });
 
-TEST_F('CvoxKeySequenceUnitTest', 'DeserializeSearchCvoxMod', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'DeserializeSearchCvoxMod',
+       function() {
   // Test the case when we do want to strip modifiers when deserializing. This
   // is important when the key sequence in the key map and the key sequence at
   // runtime both contain the bare cvox modifier as a key code such as in the
@@ -487,7 +490,7 @@ TEST_F('CvoxKeySequenceUnitTest', 'DeserializeSearchCvoxMod', function() {
   assertFalse(stickySeq.keys.searchKeyHeld[0]);
 });
 
-TEST_F('CvoxKeySequenceUnitTest', 'RequireStickyMode', function() {
+TEST_F('ChromeVoxKeySequenceUnitTest', 'RequireStickyMode', function() {
   var oneFromMap = cvox.KeySequence.deserialize({requireStickyMode: true,
                                           keys: {keyCode: [49]}});
 
diff --git a/chrome/browser/resources/chromeos/chromevox/common/page_selection_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/page_selection_test.unitjs
index 413b92924159b3..9e9263ae2a638d 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/page_selection_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/page_selection_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxPageSelectionUnitTest() {}
+function ChromeVoxPageSelectionUnitTest() {}
 
-CvoxPageSelectionUnitTest.prototype = {
+ChromeVoxPageSelectionUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -49,7 +49,7 @@ CvoxPageSelectionUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxPageSelectionUnitTest', 'BasicExtend', function() {
+TEST_F('ChromeVoxPageSelectionUnitTest', 'BasicExtend', function() {
   var pageSel = new cvox.PageSelection(this.pSel);
   pageSel.extend(this.hSel);
   this.assertSelection_('The quick\n\nbrown fox\njumped over');
@@ -61,7 +61,7 @@ TEST_F('CvoxPageSelectionUnitTest', 'BasicExtend', function() {
 
 
 /** Tests a reverse extension. */
-TEST_F('CvoxPageSelectionUnitTest', 'ReverseExtend', function() {
+TEST_F('ChromeVoxPageSelectionUnitTest', 'ReverseExtend', function() {
   var pageSel = new cvox.PageSelection(this.pSel);
   this.assertSelection_('The quick');
   pageSel.extend(this.hSel);
@@ -81,7 +81,7 @@ TEST_F('CvoxPageSelectionUnitTest', 'ReverseExtend', function() {
 /** Tests all possible configurations of PageSelection's and extending
  * CursorSelection's.
  */
-TEST_F('CvoxPageSelectionUnitTest', 'ExtendDirections', function() {
+TEST_F('ChromeVoxPageSelectionUnitTest', 'ExtendDirections', function() {
   // A normal page selection, with a normal extension.
   var pageSel = new cvox.PageSelection(this.aSel);
   assertTrue(pageSel.extend(this.hSel));
@@ -99,7 +99,7 @@ TEST_F('CvoxPageSelectionUnitTest', 'ExtendDirections', function() {
 
 
 /** Tests degenerate extensions. */
-TEST_F('CvoxPageSelectionUnitTest', 'DegenerateExtensions', function() {
+TEST_F('ChromeVoxPageSelectionUnitTest', 'DegenerateExtensions', function() {
   var pageSel = new cvox.PageSelection(this.aSel);
 
   // A normal page selection, with a normal extension not in document order.
diff --git a/chrome/browser/resources/chromeos/chromevox/common/selection_util_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/selection_util_test.unitjs
index 7adbc57a8d348f..8b78dc9f744d37 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/selection_util_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/selection_util_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxSelectionUtilUnitTest() {}
+function ChromeVoxSelectionUtilUnitTest() {}
 
-CvoxSelectionUtilUnitTest.prototype = {
+ChromeVoxSelectionUtilUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -21,7 +21,7 @@ CvoxSelectionUtilUnitTest.prototype = {
   ]
 };
 
-TEST_F('CvoxSelectionUtilUnitTest', 'SimpleFindPos', function() {
+TEST_F('ChromeVoxSelectionUtilUnitTest', 'SimpleFindPos', function() {
   this.loadDoc(function() {/*!
     <div id="foo" style="position:absolute;top:50px">
     </div>
diff --git a/chrome/browser/resources/chromeos/chromevox/common/spannable_test.unitjs b/chrome/browser/resources/chromeos/chromevox/common/spannable_test.unitjs
index 22ab46a6acdda1..ac4895d86fa22f 100644
--- a/chrome/browser/resources/chromeos/chromevox/common/spannable_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/common/spannable_test.unitjs
@@ -60,9 +60,9 @@ function assertSpanNotFound(spannable, annotation) {
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxSpannableUnitTest() {}
+function ChromeVoxSpannableUnitTest() {}
 
-CvoxSpannableUnitTest.prototype = {
+ChromeVoxSpannableUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -82,20 +82,20 @@ CvoxSpannableUnitTest.prototype = {
   }
 };
 
-TEST_F('CvoxSpannableUnitTest', 'ToStringUnannotated', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'ToStringUnannotated', function() {
   assertEquals('', new Spannable().toString());
   assertEquals('hello world', new Spannable('hello world').toString());
 });
 
 /** Tests that toString works correctly on annotated strings. */
-TEST_F('CvoxSpannableUnitTest', 'ToStringAnnotated', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'ToStringAnnotated', function() {
   var spannable = new Spannable('Hello Google');
   spannable.setSpan('http://www.google.com/', 6, 12);
   assertEquals('Hello Google', spannable.toString());
 });
 
 /** Tests the length calculation. */
-TEST_F('CvoxSpannableUnitTest', 'LengthProperty', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'LengthProperty', function() {
   var spannable = new Spannable('Hello');
   spannable.setSpan({}, 0, 3);
   assertEquals(5, spannable.length);
@@ -106,7 +106,7 @@ TEST_F('CvoxSpannableUnitTest', 'LengthProperty', function() {
 });
 
 /** Tests that a span can be added and retrieved at the beginning. */
-TEST_F('CvoxSpannableUnitTest', 'SpanBeginning', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'SpanBeginning', function() {
   var annotation = {};
   var spannable = new Spannable('Hello world');
   spannable.setSpan(annotation, 0, 5);
@@ -118,7 +118,7 @@ TEST_F('CvoxSpannableUnitTest', 'SpanBeginning', function() {
 });
 
 /** Tests that a span can be added and retrieved at the beginning. */
-TEST_F('CvoxSpannableUnitTest', 'SpanEnd', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'SpanEnd', function() {
   var annotation = {};
   var spannable = new Spannable('Hello world');
   spannable.setSpan(annotation, 6, 11);
@@ -130,7 +130,7 @@ TEST_F('CvoxSpannableUnitTest', 'SpanEnd', function() {
 });
 
 /** Tests that a zero-length span is not retrieved. */
-TEST_F('CvoxSpannableUnitTest', 'SpanZeroLength', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'SpanZeroLength', function() {
   var annotation = {};
   var spannable = new Spannable('Hello world');
   spannable.setSpan(annotation, 3, 3);
@@ -141,7 +141,7 @@ TEST_F('CvoxSpannableUnitTest', 'SpanZeroLength', function() {
 });
 
 /** Tests that a removed span is not returned. */
-TEST_F('CvoxSpannableUnitTest', 'RemoveSpan', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'RemoveSpan', function() {
   var annotation = {};
   var spannable = new Spannable('Hello world');
   spannable.setSpan(annotation, 0, 3);
@@ -152,7 +152,7 @@ TEST_F('CvoxSpannableUnitTest', 'RemoveSpan', function() {
 });
 
 /** Tests that adding a span in one place removes it from another. */
-TEST_F('CvoxSpannableUnitTest', 'SetSpanMoves', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'SetSpanMoves', function() {
   var annotation = {};
   var spannable = new Spannable('Hello world');
   spannable.setSpan(annotation, 0, 3);
@@ -164,7 +164,7 @@ TEST_F('CvoxSpannableUnitTest', 'SetSpanMoves', function() {
 });
 
 /** Tests that setSpan objects to out-of-range arguments. */
-TEST_F('CvoxSpannableUnitTest', 'SetSpanRangeError', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'SetSpanRangeError', function() {
   var spannable = new Spannable('Hello world');
 
   // Start index out of range.
@@ -187,7 +187,7 @@ TEST_F('CvoxSpannableUnitTest', 'SetSpanRangeError', function() {
  * Tests that multiple spans can be retrieved at one point.
  * The first one added which applies should be returned by getSpan.
  */
-TEST_F('CvoxSpannableUnitTest', 'MultipleSpans', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'MultipleSpans', function() {
   var annotation1 = { number: 1 };
   var annotation2 = { number: 2 };
   assertNotSame(annotation1, annotation2);
@@ -203,7 +203,7 @@ TEST_F('CvoxSpannableUnitTest', 'MultipleSpans', function() {
 });
 
 /** Tests that appending appends the strings. */
-TEST_F('CvoxSpannableUnitTest', 'AppendToString', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'AppendToString', function() {
   var spannable = new Spannable('Google');
   assertEquals('Google', spannable.toString());
   spannable.append(' Chrome');
@@ -215,7 +215,7 @@ TEST_F('CvoxSpannableUnitTest', 'AppendToString', function() {
 /**
  * Tests that appending Spannables combines annotations.
  */
-TEST_F('CvoxSpannableUnitTest', 'AppendAnnotations', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'AppendAnnotations', function() {
   var annotation1 = { number: 1 };
   var annotation2 = { number: 2 };
   assertNotSame(annotation1, annotation2);
@@ -231,7 +231,7 @@ TEST_F('CvoxSpannableUnitTest', 'AppendAnnotations', function() {
 /**
  * Tests that a span's bounds can be retrieved.
  */
-TEST_F('CvoxSpannableUnitTest', 'GetSpanStartAndEndAndLength', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'GetSpanStartAndEndAndLength', function() {
   var annotation = {};
   var spannable = new Spannable('potato wedges');
   spannable.setSpan(annotation, 8, 12);
@@ -243,7 +243,8 @@ TEST_F('CvoxSpannableUnitTest', 'GetSpanStartAndEndAndLength', function() {
 /**
  * Tests that an absent span's bounds are reported correctly.
  */
-TEST_F('CvoxSpannableUnitTest', 'GetSpanStartAndEndAndLengthAbsent', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'GetSpanStartAndEndAndLengthAbsent',
+       function() {
   var annotation = {};
   var spannable = new Spannable('potato wedges');
   assertSpanNotFound(spannable, annotation);
@@ -252,7 +253,7 @@ TEST_F('CvoxSpannableUnitTest', 'GetSpanStartAndEndAndLengthAbsent', function()
 /**
  * Test that a zero length span can still be found.
  */
-TEST_F('CvoxSpannableUnitTest', 'GetSpanStartAndEndAndLengthZeroLength',
+TEST_F('ChromeVoxSpannableUnitTest', 'GetSpanStartAndEndAndLengthZeroLength',
        function() {
   var annotation = {};
   var spannable = new Spannable('potato wedges');
@@ -266,7 +267,7 @@ TEST_F('CvoxSpannableUnitTest', 'GetSpanStartAndEndAndLengthZeroLength',
  * Tests that == (but not ===) objects are treated distinctly when getting
  * span bounds.
  */
-TEST_F('CvoxSpannableUnitTest', 'GetSpanStartAndEndEquality', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'GetSpanStartAndEndEquality', function() {
   // Note that 0 == '' and '' == 0 in JavaScript.
   var spannable = new Spannable('wat');
   spannable.setSpan(0, 0, 0);
@@ -280,7 +281,7 @@ TEST_F('CvoxSpannableUnitTest', 'GetSpanStartAndEndEquality', function() {
 /**
  * Tests that substrings have the correct character sequence.
  */
-TEST_F('CvoxSpannableUnitTest', 'Substring', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'Substring', function() {
   var assertSubstringResult = function(expected, initial, start, opt_end) {
     var spannable = new Spannable(initial);
     var substring = spannable.substring(start, opt_end);
@@ -295,7 +296,7 @@ TEST_F('CvoxSpannableUnitTest', 'Substring', function() {
 /**
  * Tests that substring arguments are validated properly.
  */
-TEST_F('CvoxSpannableUnitTest', 'SubstringRangeError', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'SubstringRangeError', function() {
   var assertRangeError = function(initial, start, opt_end) {
     var spannable = new Spannable(initial);
     assertException('expected range error', function() {
@@ -310,7 +311,7 @@ TEST_F('CvoxSpannableUnitTest', 'SubstringRangeError', function() {
 /**
  * Tests that spans in the substring range are preserved.
  */
-TEST_F('CvoxSpannableUnitTest', 'SubstringSpansIncluded', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'SubstringSpansIncluded', function() {
   var assertSpanIncluded = function(expectedSpanStart, expectedSpanEnd,
       initial, initialSpanStart, initialSpanEnd, start, opt_end) {
     var annotation = {};
@@ -343,7 +344,7 @@ TEST_F('CvoxSpannableUnitTest', 'SubstringSpansIncluded', function() {
  * Tests that spans outside the range are omitted.
  * It's fine to keep zero-length spans at the ends, though.
  */
-TEST_F('CvoxSpannableUnitTest', 'SubstringSpansExcluded', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'SubstringSpansExcluded', function() {
   var assertSpanExcluded = function(initial, spanStart, spanEnd,
       start, opt_end) {
     var annotation = {};
@@ -361,7 +362,7 @@ TEST_F('CvoxSpannableUnitTest', 'SubstringSpansExcluded', function() {
 /**
  * Tests that spans which cross the boundary are clipped.
  */
-TEST_F('CvoxSpannableUnitTest', 'SubstringSpansClipped', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'SubstringSpansClipped', function() {
   var assertSpanIncluded = function(expectedSpanStart, expectedSpanEnd,
       initial, initialSpanStart, initialSpanEnd, start, opt_end) {
     var annotation = {};
@@ -383,7 +384,7 @@ TEST_F('CvoxSpannableUnitTest', 'SubstringSpansClipped', function() {
 /**
  * Tests that whitespace is trimmed.
  */
-TEST_F('CvoxSpannableUnitTest', 'Trim', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'Trim', function() {
   var assertTrimResult = function(expected, initial) {
     assertEquals(expected, new Spannable(initial).trim().toString());
   };
@@ -398,7 +399,7 @@ TEST_F('CvoxSpannableUnitTest', 'Trim', function() {
 /**
  * Tests that trim keeps, drops and clips spans.
  */
-TEST_F('CvoxSpannableUnitTest', 'TrimSpans', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'TrimSpans', function() {
   var spannable = new Spannable(' \t Kennedy\n');
   spannable.setSpan('tab', 1, 2);
   spannable.setSpan('jfk', 3, 10);
@@ -414,7 +415,7 @@ TEST_F('CvoxSpannableUnitTest', 'TrimSpans', function() {
 /**
  * Tests that when a string is all whitespace, we trim off the *end*.
  */
-TEST_F('CvoxSpannableUnitTest', 'TrimAllWhitespace', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'TrimAllWhitespace', function() {
   var spannable = new Spannable('    ');
   spannable.setSpan('cursor 1', 0, 0);
   spannable.setSpan('cursor 2', 2, 2);
@@ -427,7 +428,7 @@ TEST_F('CvoxSpannableUnitTest', 'TrimAllWhitespace', function() {
 /**
  * Tests finding a span which is an instance of a given class.
  */
-TEST_F('CvoxSpannableUnitTest', 'GetSpanInstanceOf', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'GetSpanInstanceOf', function() {
   function ExampleConstructorBase() {}
   function ExampleConstructor1() {}
   function ExampleConstructor2() {}
@@ -447,7 +448,7 @@ TEST_F('CvoxSpannableUnitTest', 'GetSpanInstanceOf', function() {
 });
 
 /** Tests trimming only left or right. */
-TEST_F('CvoxSpannableUnitTest', 'TrimLeftOrRight', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'TrimLeftOrRight', function() {
   var spannable = new Spannable('    ');
   spannable.setSpan('cursor 1', 0, 0);
   spannable.setSpan('cursor 2', 2, 2);
@@ -483,7 +484,7 @@ TEST_F('CvoxSpannableUnitTest', 'TrimLeftOrRight', function() {
   assertEquals(0, trimmed3.getSpanEnd('cursor 2'));
 });
 
-TEST_F('CvoxSpannableUnitTest', 'Serialize', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'Serialize', function() {
   var fresh = new Spannable('text');
   var freshStatelessSerializable = new StatelessSerializableSpan();
   var freshNonStatelessSerializable = new NonStatelessSerializableSpan(14);
@@ -507,7 +508,7 @@ TEST_F('CvoxSpannableUnitTest', 'Serialize', function() {
              eqJSON(thawnNonStatelessSerializable));
 });
 
-TEST_F('CvoxSpannableUnitTest', 'GetSpanIntervals', function() {
+TEST_F('ChromeVoxSpannableUnitTest', 'GetSpanIntervals', function() {
   function Foo() {}
   function Bar() {}
   var ms = new MultiSpannable('f12b45f78b01');
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/automation_util_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/automation_util_test.extjs
index 8f983dea420dce..f5b58342cf73b8 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/automation_util_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/automation_util_test.extjs
@@ -13,11 +13,11 @@ GEN_INCLUDE(['../../testing/snippets.js']);
  * @constructor
  * @extends {ChromeVoxE2ETestBase}
  */
-function AutomationUtilE2ETest() {
+function ChromeVoxAutomationUtilE2ETest() {
   ChromeVoxNextE2ETest.call(this);
 }
 
-AutomationUtilE2ETest.prototype = {
+ChromeVoxAutomationUtilE2ETest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 
   /** @override */
@@ -63,7 +63,7 @@ AutomationUtilE2ETest.prototype = {
   */}
 };
 
-TEST_F('AutomationUtilE2ETest', 'GetAncestors', function() {
+TEST_F('ChromeVoxAutomationUtilE2ETest', 'GetAncestors', function() {
   this.runWithLoadedTree(this.basicDoc, function(root) {
     var expectedLength = 1;
     while (root) {
@@ -74,7 +74,7 @@ TEST_F('AutomationUtilE2ETest', 'GetAncestors', function() {
   });
 });
 
-TEST_F('AutomationUtilE2ETest', 'GetUniqueAncestors', function() {
+TEST_F('ChromeVoxAutomationUtilE2ETest', 'GetUniqueAncestors', function() {
   this.runWithLoadedTree(this.basicDoc, function(root) {
     var leftmost = root, rightmost = root;
     while (leftmost.firstChild)
@@ -117,7 +117,7 @@ TEST_F('AutomationUtilE2ETest', 'GetUniqueAncestors', function() {
   }.bind(this));
 });
 
-TEST_F('AutomationUtilE2ETest', 'GetDirection', function() {
+TEST_F('ChromeVoxAutomationUtilE2ETest', 'GetDirection', function() {
   this.runWithLoadedTree(this.basicDoc, function(root) {
     var left = root, right = root;
 
@@ -138,7 +138,7 @@ TEST_F('AutomationUtilE2ETest', 'GetDirection', function() {
   });
 });
 
-TEST_F('AutomationUtilE2ETest', 'VisitContainer', function() {
+TEST_F('ChromeVoxAutomationUtilE2ETest', 'VisitContainer', function() {
   this.runWithLoadedTree(toolbarDoc, function(r) {
     var pred = function(n) { return n.role != 'rootWebArea'; };
 
@@ -157,7 +157,7 @@ TEST_F('AutomationUtilE2ETest', 'VisitContainer', function() {
   });
 });
 
-TEST_F('AutomationUtilE2ETest', 'HitTest', function() {
+TEST_F('ChromeVoxAutomationUtilE2ETest', 'HitTest', function() {
   this.runWithLoadedTree(headingDoc, function(r) {
     // Gets the center point of a rect.
     function getCP(node) {
@@ -179,7 +179,7 @@ TEST_F('AutomationUtilE2ETest', 'HitTest', function() {
   });
 });
 
-TEST_F('AutomationUtilE2ETest', 'FindLastNodeSimple', function() {
+TEST_F('ChromeVoxAutomationUtilE2ETest', 'FindLastNodeSimple', function() {
   this.runWithLoadedTree(function() {/*!
     <p aria-label=" "><div aria-label="x"></div></p>
   */}, function(r) {
@@ -190,7 +190,7 @@ TEST_F('AutomationUtilE2ETest', 'FindLastNodeSimple', function() {
   });
 });
 
-TEST_F('AutomationUtilE2ETest', 'FindLastNodeNonLeaf', function() {
+TEST_F('ChromeVoxAutomationUtilE2ETest', 'FindLastNodeNonLeaf', function() {
   this.runWithLoadedTree(function() {/*!
     <div aria-label="x"><div aria-label=" "></div></div>
   */}, function(r) {
@@ -201,7 +201,7 @@ TEST_F('AutomationUtilE2ETest', 'FindLastNodeNonLeaf', function() {
   });
 });
 
-TEST_F('AutomationUtilE2ETest', 'FindLastNodeComplex', function() {
+TEST_F('ChromeVoxAutomationUtilE2ETest', 'FindLastNodeComplex', function() {
   this.runWithLoadedTree(function() {/*!
     <p>start</p>
     <div aria-label="x"><div aria-label=" "></div></div>
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
index cd9f58acf2f413..18b806f2446f09 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
@@ -13,11 +13,11 @@ GEN_INCLUDE(['../../testing/mock_feedback.js']);
  * @constructor
  * @extends {ChromeVoxNextE2ETest}
  */
-function BackgroundTest() {
+function ChromeVoxBackgroundTest() {
   ChromeVoxNextE2ETest.call(this);
 }
 
-BackgroundTest.prototype = {
+ChromeVoxBackgroundTest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 
   /** @override */
@@ -132,18 +132,18 @@ BackgroundTest.prototype = {
 };
 
 /** Tests that ChromeVox classic is in this context. */
-SYNC_TEST_F('BackgroundTest', 'ClassicNamespaces', function() {
+SYNC_TEST_F('ChromeVoxBackgroundTest', 'ClassicNamespaces', function() {
   assertEquals('object', typeof(cvox));
   assertEquals('function', typeof(cvox.ChromeVoxBackground));
 });
 
 /** Tests that ChromeVox next is in this context. */
-SYNC_TEST_F('BackgroundTest', 'NextNamespaces', function() {
+SYNC_TEST_F('ChromeVoxBackgroundTest', 'NextNamespaces', function() {
   assertEquals('function', typeof(Background));
 });
 
 /** Tests consistency of navigating forward and backward. */
-TEST_F('BackgroundTest', 'ForwardBackwardNavigation', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ForwardBackwardNavigation', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(this.linksAndHeadingsDoc, function() {
     mockFeedback.expectSpeech('start').expectBraille('start');
@@ -202,7 +202,7 @@ TEST_F('BackgroundTest', 'ForwardBackwardNavigation', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'CaretNavigation', function() {
+TEST_F('ChromeVoxBackgroundTest', 'CaretNavigation', function() {
   // TODO(plundblad): Add braille expectaions when crbug.com/523285 is fixed.
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(this.linksAndHeadingsDoc, function() {
@@ -250,7 +250,7 @@ TEST_F('BackgroundTest', 'CaretNavigation', function() {
 });
 
 /** Tests that individual buttons are stops for move-by-word functionality. */
-TEST_F('BackgroundTest', 'CaretNavigationTreatsButtonAsWord', function() {
+TEST_F('ChromeVoxBackgroundTest', 'CaretNavigationTreatsButtonAsWord', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(this.buttonDoc, function() {
     mockFeedback.expectSpeech('start');
@@ -272,7 +272,7 @@ TEST_F('BackgroundTest', 'CaretNavigationTreatsButtonAsWord', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'SelectSingleBasic', function() {
+TEST_F('ChromeVoxBackgroundTest', 'SelectSingleBasic', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(this.formsDoc, function() {
     var incrementSelectedIndex =
@@ -289,7 +289,7 @@ TEST_F('BackgroundTest', 'SelectSingleBasic', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'ContinuousRead', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ContinuousRead', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(this.linksAndHeadingsDoc, function() {
     mockFeedback.expectSpeech('start')
@@ -303,7 +303,7 @@ TEST_F('BackgroundTest', 'ContinuousRead', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'InitialFocus', function() {
+TEST_F('ChromeVoxBackgroundTest', 'InitialFocus', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree('<a href="a">a</a>',
     function(rootNode) {
@@ -313,7 +313,7 @@ TEST_F('BackgroundTest', 'InitialFocus', function() {
     });
 });
 
-TEST_F('BackgroundTest', 'AriaLabel', function() {
+TEST_F('ChromeVoxBackgroundTest', 'AriaLabel', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree('<a aria-label="foo" href="a">a</a>',
     function(rootNode) {
@@ -327,7 +327,7 @@ TEST_F('BackgroundTest', 'AriaLabel', function() {
   );
 });
 
-TEST_F('BackgroundTest', 'ShowContextMenu', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ShowContextMenu', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree('<p>before</p><a href="a">a</a>',
     function(rootNode) {
@@ -342,7 +342,7 @@ TEST_F('BackgroundTest', 'ShowContextMenu', function() {
     }.bind(this));
 });
 
-TEST_F('BackgroundTest', 'BrailleRouting', function() {
+TEST_F('ChromeVoxBackgroundTest', 'BrailleRouting', function() {
   var mockFeedback = this.createMockFeedback();
   var route = function(position) {
     assertTrue(ChromeVoxState.instance.onBrailleKeyEvent(
@@ -385,7 +385,7 @@ TEST_F('BackgroundTest', 'BrailleRouting', function() {
       });
 });
 
-TEST_F('BackgroundTest', 'FocusInputElement', function() {
+TEST_F('ChromeVoxBackgroundTest', 'FocusInputElement', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(
     function() {/*!
@@ -410,7 +410,7 @@ TEST_F('BackgroundTest', 'FocusInputElement', function() {
 });
 
 // Flaky, see https://crbug.com/622387.
-TEST_F('BackgroundTest', 'DISABLED_UseEditableState', function() {
+TEST_F('ChromeVoxBackgroundTest', 'DISABLED_UseEditableState', function() {
   this.runWithLoadedTree(
     function() {/*!
       <input type="text"></input>
@@ -441,7 +441,7 @@ TEST_F('BackgroundTest', 'DISABLED_UseEditableState', function() {
     }.bind(this));
 });
 
-TEST_F('BackgroundTest', 'EarconsForControls', function() {
+TEST_F('ChromeVoxBackgroundTest', 'EarconsForControls', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(
     function() {/*!
@@ -489,7 +489,7 @@ TEST_F('BackgroundTest', 'EarconsForControls', function() {
     }.bind(this));
 });
 
-SYNC_TEST_F('BackgroundTest', 'GlobsToRegExp', function() {
+SYNC_TEST_F('ChromeVoxBackgroundTest', 'GlobsToRegExp', function() {
   assertEquals('/^()$/', Background.globsToRegExp_([]).toString());
   assertEquals(
       '/^(http:\\/\\/host\\/path\\+here)$/',
@@ -500,7 +500,7 @@ SYNC_TEST_F('BackgroundTest', 'GlobsToRegExp', function() {
 });
 
 // Flaky, see https://crbug.com/622387.
-TEST_F('BackgroundTest', 'DISABLED_ActiveOrInactive', function() {
+TEST_F('ChromeVoxBackgroundTest', 'DISABLED_ActiveOrInactive', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
       <a href="a">a</a>
@@ -538,7 +538,7 @@ TEST_F('BackgroundTest', 'DISABLED_ActiveOrInactive', function() {
     });
 });
 
-TEST_F('BackgroundTest', 'ShouldNotFocusIframe', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ShouldNotFocusIframe', function() {
   this.runWithLoadedTree(  function() {/*!
     <iframe tabindex=0 src="data:text/html,<p>Inside</p>"></iframe>
     <button>outside</button>
@@ -560,7 +560,7 @@ TEST_F('BackgroundTest', 'ShouldNotFocusIframe', function() {
   }.bind(this));
 });
 
-TEST_F('BackgroundTest', 'ShouldFocusLink', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ShouldFocusLink', function() {
   this.runWithLoadedTree(  function() {/*!
     <div><a href="#">mylink</a></div>
     <button>after</button>
@@ -581,7 +581,7 @@ TEST_F('BackgroundTest', 'ShouldFocusLink', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'NoisySlider', function() {
+TEST_F('ChromeVoxBackgroundTest', 'NoisySlider', function() {
   var mockFeedback = this.createMockFeedback();
   // Slider aria-valuetext must change otherwise blink suppresses event.
   this.runWithLoadedTree(  function() {/*!
@@ -610,7 +610,7 @@ TEST_F('BackgroundTest', 'NoisySlider', function() {
   }.bind(this));
 });
 
-TEST_F('BackgroundTest', 'Checkbox', function() {
+TEST_F('ChromeVoxBackgroundTest', 'Checkbox', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="checkbox">go</div>
@@ -645,7 +645,7 @@ TEST_F('BackgroundTest', 'Checkbox', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'MixedCheckbox', function() {
+TEST_F('ChromeVoxBackgroundTest', 'MixedCheckbox', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="checkbox" aria-checked="mixed">go</div>
@@ -655,7 +655,7 @@ TEST_F('BackgroundTest', 'MixedCheckbox', function() {
 });
 
 /** Tests navigating into and out of iframes using nextButton */
-TEST_F('BackgroundTest', 'ForwardNavigationThroughIframeButtons', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ForwardNavigationThroughIframeButtons', function() {
   var mockFeedback = this.createMockFeedback();
 
   var running = false;
@@ -697,7 +697,7 @@ TEST_F('BackgroundTest', 'ForwardNavigationThroughIframeButtons', function() {
 });
 
 /** Tests navigating into and out of iframes using nextObject */
-TEST_F('BackgroundTest', 'ForwardObjectNavigationThroughIframes', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ForwardObjectNavigationThroughIframes', function() {
   var mockFeedback = this.createMockFeedback();
 
   var running = false;
@@ -746,7 +746,7 @@ TEST_F('BackgroundTest', 'ForwardObjectNavigationThroughIframes', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'SelectOptionSelected', function() {
+TEST_F('ChromeVoxBackgroundTest', 'SelectOptionSelected', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <select>
@@ -770,7 +770,7 @@ TEST_F('BackgroundTest', 'SelectOptionSelected', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'ToggleButton', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ToggleButton', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div aria-pressed="mixed" role="button">boldface</div>
@@ -803,7 +803,7 @@ TEST_F('BackgroundTest', 'ToggleButton', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'EditText', function() {
+TEST_F('ChromeVoxBackgroundTest', 'EditText', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <input type="text"></input>
@@ -819,7 +819,7 @@ TEST_F('BackgroundTest', 'EditText', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'BackwardForwardSync', function() {
+TEST_F('ChromeVoxBackgroundTest', 'BackwardForwardSync', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div aria-label="Group" role="group" tabindex=0>
@@ -852,7 +852,7 @@ TEST_F('BackgroundTest', 'BackwardForwardSync', function() {
 });
 
 /** Tests that navigation works when the current object disappears. */
-TEST_F('BackgroundTest', 'DisappearingObject', function() {
+TEST_F('ChromeVoxBackgroundTest', 'DisappearingObject', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(this.disappearingObjectDoc, function(rootNode) {
     var deleteButton = rootNode.find({role: RoleType.BUTTON,
@@ -891,7 +891,7 @@ TEST_F('BackgroundTest', 'DisappearingObject', function() {
 });
 
 /** Tests that focus jumps to details properly when indicated. */
-TEST_F('BackgroundTest', 'JumpToDetails', function() {
+TEST_F('ChromeVoxBackgroundTest', 'JumpToDetails', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(this.detailsDoc, function(rootNode) {
     mockFeedback.call(doCmd('jumpToDetails'))
@@ -901,7 +901,7 @@ TEST_F('BackgroundTest', 'JumpToDetails', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'ButtonNameValueDescription', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ButtonNameValueDescription', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <input type="submit" aria-label="foo" value="foo"></input>
@@ -914,7 +914,7 @@ TEST_F('BackgroundTest', 'ButtonNameValueDescription', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'NameFromHeadingLink', function() {
+TEST_F('ChromeVoxBackgroundTest', 'NameFromHeadingLink', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <p>before</p>
@@ -929,7 +929,7 @@ TEST_F('BackgroundTest', 'NameFromHeadingLink', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'OptionChildIndexCount', function() {
+TEST_F('ChromeVoxBackgroundTest', 'OptionChildIndexCount', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <div role="listbox">
@@ -950,7 +950,7 @@ TEST_F('BackgroundTest', 'OptionChildIndexCount', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'ListMarkerIsIgnored', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ListMarkerIsIgnored', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <ul><li>apple</ul>
@@ -962,7 +962,7 @@ TEST_F('BackgroundTest', 'ListMarkerIsIgnored', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'SymetricComplexHeading', function() {
+TEST_F('ChromeVoxBackgroundTest', 'SymetricComplexHeading', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <h4><p>NW</p><p>NE</p></h4>
@@ -978,7 +978,7 @@ TEST_F('BackgroundTest', 'SymetricComplexHeading', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'ContentEditableJumpSyncsRange', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ContentEditableJumpSyncsRange', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <p>start</p>
@@ -1010,7 +1010,7 @@ TEST_F('BackgroundTest', 'ContentEditableJumpSyncsRange', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'Selection', function() {
+TEST_F('ChromeVoxBackgroundTest', 'Selection', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <p>simple</p>
@@ -1035,7 +1035,7 @@ TEST_F('BackgroundTest', 'Selection', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'BasicTableCommands', function() {
+TEST_F('ChromeVoxBackgroundTest', 'BasicTableCommands', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
   <table border=1>
@@ -1105,7 +1105,7 @@ TEST_F('BackgroundTest', 'BasicTableCommands', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'MissingTableCells', function() {
+TEST_F('ChromeVoxBackgroundTest', 'MissingTableCells', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
   <table border=1>
@@ -1147,7 +1147,7 @@ TEST_F('BackgroundTest', 'MissingTableCells', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'DisabledState', function() {
+TEST_F('ChromeVoxBackgroundTest', 'DisabledState', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <button aria-disabled="true">ok</button>
@@ -1156,7 +1156,7 @@ TEST_F('BackgroundTest', 'DisabledState', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'HeadingLevels', function() {
+TEST_F('ChromeVoxBackgroundTest', 'HeadingLevels', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <h1>1</h1><h2>2</h2><h3>3</h3><h4>4</h4><h5>5</h5><h6>6</h6>
@@ -1176,7 +1176,7 @@ TEST_F('BackgroundTest', 'HeadingLevels', function() {
 });
 
 // Flaky, see https://crbug.com/622387.
-TEST_F('BackgroundTest', 'DISABLED_EditableNavigation', function() {
+TEST_F('ChromeVoxBackgroundTest', 'DISABLED_EditableNavigation', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <div contenteditable>this is a test</div>
@@ -1193,7 +1193,7 @@ TEST_F('BackgroundTest', 'DISABLED_EditableNavigation', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'NavigationMovesFocus', function() {
+TEST_F('ChromeVoxBackgroundTest', 'NavigationMovesFocus', function() {
   this.runWithLoadedTree(function(root) {/*!
     <p>start</p>
     <input type="text"></input>
@@ -1208,7 +1208,7 @@ TEST_F('BackgroundTest', 'NavigationMovesFocus', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'BrailleCaretNavigation', function() {
+TEST_F('ChromeVoxBackgroundTest', 'BrailleCaretNavigation', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <p>This is a<em>test</em> of inline braille<br>with a second line</p>
@@ -1229,7 +1229,7 @@ TEST_F('BackgroundTest', 'BrailleCaretNavigation', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'InPageLinks', function() {
+TEST_F('ChromeVoxBackgroundTest', 'InPageLinks', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <a href="#there">hi</a>
@@ -1242,7 +1242,7 @@ TEST_F('BackgroundTest', 'InPageLinks', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'ListItem', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ListItem', function() {
   this.resetContextualOutput();
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
@@ -1273,7 +1273,7 @@ TEST_F('BackgroundTest', 'ListItem', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'BusyHeading', function() {
+TEST_F('ChromeVoxBackgroundTest', 'BusyHeading', function() {
   this.resetContextualOutput();
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
@@ -1290,7 +1290,7 @@ TEST_F('BackgroundTest', 'BusyHeading', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'NodeVsSubnode', function() {
+TEST_F('ChromeVoxBackgroundTest', 'NodeVsSubnode', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <a href="#">test</a>
@@ -1320,7 +1320,7 @@ TEST_F('BackgroundTest', 'NodeVsSubnode', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'NativeFind', function() {
+TEST_F('ChromeVoxBackgroundTest', 'NativeFind', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <a href="#">grape</a>
@@ -1337,7 +1337,7 @@ TEST_F('BackgroundTest', 'NativeFind', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'EditableKeyCommand', function() {
+TEST_F('ChromeVoxBackgroundTest', 'EditableKeyCommand', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <input type="text"></input>
@@ -1370,7 +1370,7 @@ TEST_F('BackgroundTest', 'EditableKeyCommand', function() {
 });
 
 // Failing consistently, please see https://crbug.com/857382
-TEST_F('BackgroundTest', 'DISABLED_TextSelectionAndLiveRegion', function() {
+TEST_F('ChromeVoxBackgroundTest', 'DISABLED_TextSelectionAndLiveRegion', function() {
   DesktopAutomationHandler.announceActions = true;
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
@@ -1408,7 +1408,7 @@ TEST_F('BackgroundTest', 'DISABLED_TextSelectionAndLiveRegion', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'TableColumnHeaders', function() {
+TEST_F('ChromeVoxBackgroundTest', 'TableColumnHeaders', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <div role="grid">
@@ -1449,7 +1449,7 @@ TEST_F('BackgroundTest', 'TableColumnHeaders', function() {
 });
 
 // Flaky, see https://crbug.com/622387.
-TEST_F('BackgroundTest', 'DISABLED_ActiveDescendantUpdates', function() {
+TEST_F('ChromeVoxBackgroundTest', 'DISABLED_ActiveDescendantUpdates', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*!
     <div aria-label="container" tabindex=0 role="group" id="active"
@@ -1481,7 +1481,7 @@ TEST_F('BackgroundTest', 'DISABLED_ActiveDescendantUpdates', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'NavigationEscapesEdit', function() {
+TEST_F('ChromeVoxBackgroundTest', 'NavigationEscapesEdit', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <p>before content editable</p>
@@ -1556,7 +1556,7 @@ TEST_F('BackgroundTest', 'NavigationEscapesEdit', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'NavigationSyncsSelect', function() {
+TEST_F('ChromeVoxBackgroundTest', 'NavigationSyncsSelect', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <select>
@@ -1578,7 +1578,7 @@ TEST_F('BackgroundTest', 'NavigationSyncsSelect', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'NavigationIgnoresLabels', function() {
+TEST_F('ChromeVoxBackgroundTest', 'NavigationIgnoresLabels', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <p>before</p>
@@ -1610,7 +1610,7 @@ TEST_F('BackgroundTest', 'NavigationIgnoresLabels', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'NavigationIgnoresDescriptions', function() {
+TEST_F('ChromeVoxBackgroundTest', 'NavigationIgnoresDescriptions', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <p>before</p>
@@ -1642,7 +1642,7 @@ TEST_F('BackgroundTest', 'NavigationIgnoresDescriptions', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'MathContentViaInnerHtml', function() {
+TEST_F('ChromeVoxBackgroundTest', 'MathContentViaInnerHtml', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*
     <div role="math">
@@ -1685,7 +1685,7 @@ TEST_F('BackgroundTest', 'MathContentViaInnerHtml', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'GestureGranularity', function() {
+TEST_F('ChromeVoxBackgroundTest', 'GestureGranularity', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*
     <p>This is a test</p>
@@ -1726,7 +1726,7 @@ TEST_F('BackgroundTest', 'GestureGranularity', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'LinesFilterWhitespace', function() {
+TEST_F('ChromeVoxBackgroundTest', 'LinesFilterWhitespace', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*
     <p>start</p>
@@ -1747,7 +1747,7 @@ TEST_F('BackgroundTest', 'LinesFilterWhitespace', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'TabSwitchAndRefreshRecovery', function() {
+TEST_F('ChromeVoxBackgroundTest', 'TabSwitchAndRefreshRecovery', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*
     <p>tab1</p>
@@ -1775,7 +1775,7 @@ TEST_F('BackgroundTest', 'TabSwitchAndRefreshRecovery', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'ListName', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ListName', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*
     <div id="_md-chips-wrapper-76" tabindex="-1" class="md-chips md-readonly" aria-setsize="4" aria-label="Favorite Sports" role="list" aria-describedby="chipsNote">
@@ -1790,7 +1790,7 @@ TEST_F('BackgroundTest', 'ListName', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'LayoutTable', function() {
+TEST_F('ChromeVoxBackgroundTest', 'LayoutTable', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*
     <table><tr><td>start</td></tr></table>
@@ -1803,7 +1803,7 @@ TEST_F('BackgroundTest', 'LayoutTable', function() {
   });
 });
 
-TEST_F('BackgroundTest', 'ReinsertedNodeRecovery', function() {
+TEST_F('ChromeVoxBackgroundTest', 'ReinsertedNodeRecovery', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function(root) {/*
     <div>
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors_test.extjs
index f5f42d72672584..9a849129c6067d 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors_test.extjs
@@ -10,11 +10,11 @@ GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js']);
  * @constructor
  * @extends {ChromeVoxNextE2ETest}
  */
-function CursorsTest() {
+function ChromeVoxCursorsTest() {
   ChromeVoxNextE2ETest.call(this);
 }
 
-CursorsTest.prototype = {
+ChromeVoxCursorsTest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 
   /** Test cursors.Cursor. @const {string} */
@@ -129,7 +129,7 @@ simpleDoc: function() {/*!
   */}
 };
 
-TEST_F('CursorsTest', 'CharacterCursor', function() {
+TEST_F('ChromeVoxCursorsTest', 'CharacterCursor', function() {
   this.runCursorMovesOnDocument(this.simpleDoc, [
     [CHARACTER, DIRECTIONAL, FORWARD, {index: 1, value: 'start '}],
     [CHARACTER, DIRECTIONAL, BACKWARD, {index: 0, value: 'start '}],
@@ -149,7 +149,7 @@ TEST_F('CursorsTest', 'CharacterCursor', function() {
     [CHARACTER, DIRECTIONAL, BACKWARD, {index: 5, value: 'start '}],]);
 });
 
-TEST_F('CursorsTest', 'WordCursor', function() {
+TEST_F('ChromeVoxCursorsTest', 'WordCursor', function() {
   this.runCursorMovesOnDocument(this.simpleDoc, [
     // Word (BOUND).
     [WORD, BOUND, BACKWARD, {index: 0, value: 'start '}],
@@ -171,7 +171,7 @@ TEST_F('CursorsTest', 'WordCursor', function() {
     [WORD, DIRECTIONAL, BACKWARD, {index: 0, value: undefined}]]);
 });
 
-TEST_F('CursorsTest', 'CharacterWordCursor', function() {
+TEST_F('ChromeVoxCursorsTest', 'CharacterWordCursor', function() {
   this.runCursorMovesOnDocument(this.simpleDoc, [
     [CHARACTER, DIRECTIONAL, FORWARD, {index: 1, value: 'start '}],
 
@@ -187,7 +187,7 @@ TEST_F('CursorsTest', 'CharacterWordCursor', function() {
     [WORD, DIRECTIONAL, BACKWARD, {index: 0, value: 'start '}]]);
 });
 
-TEST_F('CursorsTest', 'LineCursor', function() {
+TEST_F('ChromeVoxCursorsTest', 'LineCursor', function() {
   this.runCursorMovesOnDocument(this.simpleDoc, [
     // Line (BOUND).
     [LINE, BOUND, FORWARD, {value: 'same line'}],
@@ -204,7 +204,7 @@ TEST_F('CursorsTest', 'LineCursor', function() {
     [LINE, BOUND, BACKWARD, {value: 'start '}]]);
 });
 
-TEST_F('CursorsTest', 'CharacterRange', function() {
+TEST_F('ChromeVoxCursorsTest', 'CharacterRange', function() {
   this.runCursorMovesOnDocument(this.simpleDoc, [
       [CHARACTER, FORWARD,
           {value: 'start ', index: 1}, {value: 'start ', index: 2}],
@@ -237,7 +237,7 @@ TEST_F('CursorsTest', 'CharacterRange', function() {
   ], this.RANGE);
 });
 
-TEST_F('CursorsTest', 'WordRange', function() {
+TEST_F('ChromeVoxCursorsTest', 'WordRange', function() {
   this.runCursorMovesOnDocument(this.simpleDoc, [
       [WORD, FORWARD,
           {value: 'same line', index: 0}, {value: 'same line', index: 4}],
@@ -262,7 +262,7 @@ TEST_F('CursorsTest', 'WordRange', function() {
 });
 
 
-TEST_F('CursorsTest', 'LineRange', function() {
+TEST_F('ChromeVoxCursorsTest', 'LineRange', function() {
   this.runCursorMovesOnDocument(this.simpleDoc, [
         [LINE, FORWARD, {value: 'end', index: 0}, {value: 'end', index: 3}],
       [LINE, FORWARD, {value: 'end', index: 0}, {value: 'end', index: 3}],
@@ -277,7 +277,7 @@ TEST_F('CursorsTest', 'LineRange', function() {
   ], this.RANGE);
 });
 
-TEST_F('CursorsTest', 'DontSplitOnNodeNavigation', function() {
+TEST_F('ChromeVoxCursorsTest', 'DontSplitOnNodeNavigation', function() {
   this.runWithLoadedTree(this.multiInlineDoc, function(root) {
     var para = root.firstChild;
     assertEquals('paragraph', para.role);
@@ -297,7 +297,7 @@ TEST_F('CursorsTest', 'DontSplitOnNodeNavigation', function() {
   });
 });
 
-TEST_F('CursorsTest', 'WrappingCursors', function() {
+TEST_F('ChromeVoxCursorsTest', 'WrappingCursors', function() {
   this.runWithLoadedTree(this.multiInlineDoc, function(root) {
     var first = root;
     var last = root.lastChild.firstChild;
@@ -313,7 +313,7 @@ TEST_F('CursorsTest', 'WrappingCursors', function() {
   });
 });
 
-TEST_F('CursorsTest', 'IsInWebRange', function() {
+TEST_F('ChromeVoxCursorsTest', 'IsInWebRange', function() {
   this.runWithLoadedTree(this.simpleDoc, function(root) {
     var para = root.firstChild;
     var webRange = new cursors.Range.fromNode(para);
@@ -323,7 +323,7 @@ TEST_F('CursorsTest', 'IsInWebRange', function() {
   });
 });
 
-TEST_F('CursorsTest', 'SingleDocSelection', function() {
+TEST_F('ChromeVoxCursorsTest', 'SingleDocSelection', function() {
   this.runWithLoadedTree(function() {/*!
     <span>start</span>
     <p><a href="google.com">google home page</a></p>
@@ -364,7 +364,7 @@ TEST_F('CursorsTest', 'SingleDocSelection', function() {
   });
 });
 
-TEST_F('CursorsTest', 'MultiLineOffsetSelection', function() {
+TEST_F('ChromeVoxCursorsTest', 'MultiLineOffsetSelection', function() {
   this.runWithLoadedTree(this.multiInlineDoc, function(root) {
     var secondLine = root.firstChild.firstChild.firstChild.nextSibling;
     assertEquals('inlineTextBox', secondLine.role);
@@ -393,7 +393,7 @@ TEST_F('CursorsTest', 'MultiLineOffsetSelection', function() {
   });
 });
 
-TEST_F('CursorsTest', 'InlineElementOffset', function() {
+TEST_F('ChromeVoxCursorsTest', 'InlineElementOffset', function() {
   this.runWithLoadedTree(function() {/*!
     <span>start</span>
     <p>This<br> is a<a href="#g">test</a>of selection</p>
@@ -431,7 +431,7 @@ TEST_F('CursorsTest', 'InlineElementOffset', function() {
   });
 });
 
-TEST_F('CursorsTest', 'ContentEquality', function() {
+TEST_F('ChromeVoxCursorsTest', 'ContentEquality', function() {
   this.runWithLoadedTree(function() {/*!
     <div role="region">this is a test</button>
   */}, function(root) {
@@ -463,7 +463,7 @@ TEST_F('CursorsTest', 'ContentEquality', function() {
   });
 });
 
-TEST_F('CursorsTest', 'DeepEquivalency', function() {
+TEST_F('ChromeVoxCursorsTest', 'DeepEquivalency', function() {
   this.runWithLoadedTree(function() {/*!
     <p style="word-spacing:100000px">this is a test</p>
   */}, function(root) {
@@ -514,7 +514,7 @@ TEST_F('CursorsTest', 'DeepEquivalency', function() {
   });
 });
 
-TEST_F('CursorsTest', 'SelectionAdjustmentsRichText', function() {
+TEST_F('ChromeVoxCursorsTest', 'SelectionAdjustmentsRichText', function() {
   this.runWithLoadedTree(function() {/*!
     <div contenteditable><p>test</p><p>123</p></div>
   */}, function(root) {
@@ -563,7 +563,7 @@ TEST_F('CursorsTest', 'SelectionAdjustmentsRichText', function() {
   });
 });
 
-TEST_F('CursorsTest', 'SelectionAdjustmentsNonRichText', function() {
+TEST_F('ChromeVoxCursorsTest', 'SelectionAdjustmentsNonRichText', function() {
   this.runWithLoadedTree(function() {/*!
     <input type="text"></input>
     <textarea></textarea>
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/editing_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/editing_test.extjs
index 36a626a2e68272..b0e93ebbeeb807 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/editing_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/editing_test.extjs
@@ -13,12 +13,12 @@ GEN_INCLUDE(['../../testing/mock_feedback.js']);
  * @constructor
  * @extends {ChromeVoxNextE2ETest}
  */
-function EditingTest() {
+function ChromeVoxEditingTest() {
   ChromeVoxNextE2ETest.call(this);
   window.RoleType = chrome.automation.RoleType;
 }
 
-EditingTest.prototype = {
+ChromeVoxEditingTest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 
   /**
@@ -50,7 +50,7 @@ line 3
 </textarea>
 */};
 
-TEST_F('EditingTest', 'Focus', function() {
+TEST_F('ChromeVoxEditingTest', 'Focus', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(doc, function(root) {
     var singleLine = root.find({role: RoleType.TEXT_FIELD,
@@ -73,7 +73,7 @@ TEST_F('EditingTest', 'Focus', function() {
   });
 });
 
-TEST_F('EditingTest', 'Multiline', function() {
+TEST_F('ChromeVoxEditingTest', 'Multiline', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(doc, function(root) {
     var textarea = root.find({role: RoleType.TEXT_FIELD,
@@ -102,7 +102,7 @@ TEST_F('EditingTest', 'Multiline', function() {
   });
 });
 
-TEST_F('EditingTest', 'TextButNoSelectionChange', function() {
+TEST_F('ChromeVoxEditingTest', 'TextButNoSelectionChange', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(
     function() {/*!
@@ -137,7 +137,7 @@ TEST_F('EditingTest', 'TextButNoSelectionChange', function() {
     });
 });
 
-TEST_F('EditingTest', 'RichTextMoveByLine', function() {
+TEST_F('ChromeVoxEditingTest', 'RichTextMoveByLine', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="textbox" contenteditable>
@@ -184,7 +184,7 @@ TEST_F('EditingTest', 'RichTextMoveByLine', function() {
   });
 });
 
-TEST_F('EditingTest', 'RichTextMoveByCharacter', function() {
+TEST_F('ChromeVoxEditingTest', 'RichTextMoveByCharacter', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="textbox" contenteditable>This <b>is</b> a test.</div>
@@ -254,7 +254,7 @@ TEST_F('EditingTest', 'RichTextMoveByCharacter', function() {
 });
 
 // Tests specifically for cursor workarounds.
-TEST_F('EditingTest', 'RichTextMoveByCharacterNodeWorkaround', function() {
+TEST_F('ChromeVoxEditingTest', 'RichTextMoveByCharacterNodeWorkaround', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="textbox" contenteditable>hello <b>world</b></div>
@@ -295,7 +295,7 @@ TEST_F('EditingTest', 'RichTextMoveByCharacterNodeWorkaround', function() {
   });
 });
 
-TEST_F('EditingTest', 'RichTextMoveByCharacterEndOfLine', function() {
+TEST_F('ChromeVoxEditingTest', 'RichTextMoveByCharacterEndOfLine', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="textbox" contenteditable>Test</div>
@@ -331,7 +331,7 @@ TEST_F('EditingTest', 'RichTextMoveByCharacterEndOfLine', function() {
   });
 });
 
-TEST_F('EditingTest', 'RichTextLinkOutput', function() {
+TEST_F('ChromeVoxEditingTest', 'RichTextLinkOutput', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="textbox" contenteditable>a <a href="#">test</a></div>
@@ -375,7 +375,7 @@ TEST_F('EditingTest', 'RichTextLinkOutput', function() {
   });
 });
 
-TEST_F('EditingTest', 'RichTextExtendByCharacter', function() {
+TEST_F('ChromeVoxEditingTest', 'RichTextExtendByCharacter', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="textbox" contenteditable>Te<br>st</div>
@@ -409,7 +409,7 @@ TEST_F('EditingTest', 'RichTextExtendByCharacter', function() {
   });
 });
 
-TEST_F('EditingTest', 'RichTextImageByCharacter', function() {
+TEST_F('ChromeVoxEditingTest', 'RichTextImageByCharacter', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <p id="go" contenteditable>
@@ -470,13 +470,17 @@ TEST_F('EditingTest', 'RichTextImageByCharacter', function() {
   });
 });
 
-TEST_F('EditingTest', 'RichTextSelectByLine', function() {
+TEST_F('ChromeVoxEditingTest', 'RichTextSelectByLine', function() {
   var mockFeedback = this.createMockFeedback();
+  // Use digit strings like "11111" and "22222" because the character widths
+  // of digits are always the same. This means the test can move down one line
+  // middle of "11111" and reliably hit a given character position in "22222",
+  // regardless of font configuration. https://crbug.com/898213
   this.runWithLoadedTree(function() {/*!
     <p id="go" contenteditable>
-      first line<br>
-      second line<br>
-      third line<br>
+      11111 line<br>
+      22222 line<br>
+      33333 line<br>
     </p>
     <script>
       var commands = [
@@ -513,11 +517,11 @@ TEST_F('EditingTest', 'RichTextSelectByLine', function() {
 
       // By character.
       mockFeedback.call(move)
-          .expectSpeech('f', 'selected')
-          .expectBraille('first line\nmled', {startIndex: 0, endIndex: 1})
+          .expectSpeech('1', 'selected')
+          .expectBraille('11111 line\nmled', {startIndex: 0, endIndex: 1})
           .call(move)
-          .expectSpeech('i', 'added to selection')
-          .expectBraille('first line\nmled', {startIndex: 0, endIndex: 2})
+          .expectSpeech('1', 'added to selection')
+          .expectBraille('11111 line\nmled', {startIndex: 0, endIndex: 2})
 
           // Forward selection.
 
@@ -526,54 +530,54 @@ TEST_F('EditingTest', 'RichTextSelectByLine', function() {
           // By line (notice the partial selections from the first and second
           // lines).
           .call(move)
-          .expectSpeech('rst line \n se', 'selected')
-          .expectBraille('second line\n', {startIndex: 0, endIndex: 2})
+          .expectSpeech('111 line \n 22', 'selected')
+          .expectBraille('22222 line\n', {startIndex: 0, endIndex: 2})
 
           .call(move)
-          .expectSpeech('cond line \n th', 'selected')
-          .expectBraille('third line\n', {startIndex: 0, endIndex: 2})
+          .expectSpeech('222 line \n 33', 'selected')
+          .expectBraille('33333 line\n', {startIndex: 0, endIndex: 2})
 
           // Shrinking.
           .call(move)
-          .expectSpeech('cond line \n th', 'unselected')
-          .expectBraille('second line\n', {startIndex: 0, endIndex: 2})
+          .expectSpeech('222 line \n 33', 'unselected')
+          .expectBraille('22222 line\n', {startIndex: 0, endIndex: 2})
 
           .call(move)
-          .expectSpeech('fi', 'selected')
-          .expectBraille('first line\nmled', {startIndex: 0, endIndex: 2})
+          .expectSpeech('11', 'selected')
+          .expectBraille('11111 line\nmled', {startIndex: 0, endIndex: 2})
 
           // Document boundary.
           .call(move)
-          .expectSpeech('rst line \n second line \n third line \n \n',
+          .expectSpeech('111 line \n 22222 line \n 33333 line \n \n',
                         'selected')
-          .expectBraille('third line\n', {startIndex: 0, endIndex: 10})
+          .expectBraille('33333 line\n', {startIndex: 0, endIndex: 10})
 
           // The script repositions the caret to the 'n' of the third line.
           .call(move)
-          .expectSpeech('third line')
-          .expectBraille('third line\n', {startIndex: 10, endIndex: 10})
+          .expectSpeech('33333 line')
+          .expectBraille('33333 line\n', {startIndex: 10, endIndex: 10})
           .call(move)
           .expectSpeech('e')
-          .expectBraille('third line\n', {startIndex: 9, endIndex: 9})
+          .expectBraille('33333 line\n', {startIndex: 9, endIndex: 9})
           .call(move)
           .expectSpeech('n')
-          .expectBraille('third line\n', {startIndex: 8, endIndex: 8})
+          .expectBraille('33333 line\n', {startIndex: 8, endIndex: 8})
 
           // Backward selection.
 
           // Growing.
           .call(move)
-          .expectSpeech(' line \n third li', 'selected')
-          .expectBraille('second line\n', {startIndex: 6, endIndex: 12})
+          .expectSpeech('ne \n 33333 li', 'selected')
+          .expectBraille('22222 line\n', {startIndex: 8, endIndex: 11})
 
           .call(move)
-          .expectSpeech('e \n second', 'selected')
-          .expectBraille('first line\n', {startIndex: 9, endIndex: 11})
+          .expectSpeech('ne \n 22222 li', 'selected')
+          .expectBraille('11111 line\n', {startIndex: 8, endIndex: 11})
 
           // Shrinking.
           .call(move)
-          .expectSpeech('e \n second', 'unselected')
-          .expectBraille('second line\n', {startIndex: 6, endIndex: 12})
+          .expectSpeech('ne \n 22222 li', 'unselected')
+          .expectBraille('22222 line\n', {startIndex: 8, endIndex: 11})
 
           .replay();
     });
@@ -581,7 +585,7 @@ TEST_F('EditingTest', 'RichTextSelectByLine', function() {
   });
 });
 
-TEST_F('EditingTest', 'EditableLineOneStaticText', function() {
+TEST_F('ChromeVoxEditingTest', 'EditableLineOneStaticText', function() {
   this.runWithLoadedTree(function() {/*!
     <p contenteditable style="word-spacing:100000px">this is a test</p>
   */}, function(root) {
@@ -633,7 +637,7 @@ TEST_F('EditingTest', 'EditableLineOneStaticText', function() {
   });
 });
 
-TEST_F('EditingTest', 'EditableLineTwoStaticTexts', function() {
+TEST_F('ChromeVoxEditingTest', 'EditableLineTwoStaticTexts', function() {
   this.runWithLoadedTree(function() {/*!
     <p contenteditable>hello <b>world</b></p>
   */}, function(root) {
@@ -686,7 +690,7 @@ TEST_F('EditingTest', 'EditableLineTwoStaticTexts', function() {
   });
 });
 
-TEST_F('EditingTest', 'EditableLineEquality', function() {
+TEST_F('ChromeVoxEditingTest', 'EditableLineEquality', function() {
   this.runWithLoadedTree(function() {/*!
     <div contenteditable role="textbox">
       <p style="word-spacing:100000px">this is a test</p>
@@ -763,7 +767,7 @@ TEST_F('EditingTest', 'EditableLineEquality', function() {
   });
 });
 
-TEST_F('EditingTest', 'EditableLineStrictEquality', function() {
+TEST_F('ChromeVoxEditingTest', 'EditableLineStrictEquality', function() {
   this.runWithLoadedTree(function() {/*!
     <div contenteditable role="textbox">
       <p style="word-spacing:100000px">this is a test</p>
@@ -818,7 +822,7 @@ TEST_F('EditingTest', 'EditableLineStrictEquality', function() {
   });
 });
 
-TEST_F('EditingTest', 'EditableLineBaseLineAnchorOrFocus', function() {
+TEST_F('ChromeVoxEditingTest', 'EditableLineBaseLineAnchorOrFocus', function() {
   this.runWithLoadedTree(function() {/*!
     <div contenteditable role="textbox">
       <p style="word-spacing:100000px">this is a test</p>
@@ -862,7 +866,7 @@ TEST_F('EditingTest', 'EditableLineBaseLineAnchorOrFocus', function() {
   })
 });
 
-TEST_F('EditingTest', 'IsValidLine', function() {
+TEST_F('ChromeVoxEditingTest', 'IsValidLine', function() {
   this.runWithLoadedTree(function() {/*!
     <div contenteditable role="textbox">
       <p style="word-spacing:100000px">this is a test</p>
@@ -904,7 +908,7 @@ TEST_F('EditingTest', 'IsValidLine', function() {
   })
 });
 
-TEST_F('EditingTest', 'TelTrimsWhitespace', function() {
+TEST_F('ChromeVoxEditingTest', 'TelTrimsWhitespace', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go"></div>
@@ -947,7 +951,7 @@ TEST_F('EditingTest', 'TelTrimsWhitespace', function() {
   });
 });
 
-TEST_F('EditingTest', 'BackwardWordDelete', function() {
+TEST_F('ChromeVoxEditingTest', 'BackwardWordDelete', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div
@@ -978,7 +982,7 @@ TEST_F('EditingTest', 'BackwardWordDelete', function() {
   });
 });
 
-TEST_F('EditingTest', 'BackwardWordDeleteAcrossParagraphs', function() {
+TEST_F('ChromeVoxEditingTest', 'BackwardWordDeleteAcrossParagraphs', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/i_search_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/i_search_test.extjs
index 27ff448b00ba3a..9f004358c35cb2 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/i_search_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/i_search_test.extjs
@@ -10,11 +10,11 @@ GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js']);
  * @constructor
  * @extends {ChromeVoxNextE2ETest}
  */
-function ISearchTest() {
+function ChromeVoxISearchTest() {
   ChromeVoxNextE2ETest.call(this);
 }
 
-ISearchTest.prototype = {
+ChromeVoxISearchTest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 
   /** @override */
@@ -64,7 +64,7 @@ FakeISearchHandler.prototype = {
   }
 };
 
-TEST_F('ISearchTest', 'DISABLED_Simple', function() {
+TEST_F('ChromeVoxISearchTest', 'DISABLED_Simple', function() {
   this.runWithLoadedTree(this.linksAndHeadingsDoc, function(rootNode) {
     var handler = new FakeISearchHandler(this);
     var search = new ISearch(rootNode);
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/live_regions_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/live_regions_test.extjs
index e3312bd0d9deab..cf247dd2780df5 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/live_regions_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/live_regions_test.extjs
@@ -13,11 +13,11 @@ GEN_INCLUDE(['../../testing/mock_feedback.js']);
  * @constructor
  * @extends {ChromeVoxNextE2ETest}
  */
-function LiveRegionsTest() {
+function ChromeVoxLiveRegionsTest() {
   ChromeVoxNextE2ETest.call(this);
 }
 
-LiveRegionsTest.prototype = {
+ChromeVoxLiveRegionsTest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 
   /** @override */
@@ -48,7 +48,7 @@ LiveRegionsTest.prototype = {
   },
 };
 
-TEST_F('LiveRegionsTest', 'LiveRegionAddElement', function() {
+TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionAddElement', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(
     function() {/*!
@@ -69,7 +69,7 @@ TEST_F('LiveRegionsTest', 'LiveRegionAddElement', function() {
     });
 });
 
-TEST_F('LiveRegionsTest', 'LiveRegionRemoveElement', function() {
+TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionRemoveElement', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(
     function() {/*!
@@ -91,7 +91,7 @@ TEST_F('LiveRegionsTest', 'LiveRegionRemoveElement', function() {
     });
 });
 
-TEST_F('LiveRegionsTest', 'LiveRegionChangeAtomic', function() {
+TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionChangeAtomic', function() {
   LiveRegions.LIVE_REGION_QUEUE_TIME_MS = 0;
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(
@@ -115,7 +115,7 @@ TEST_F('LiveRegionsTest', 'LiveRegionChangeAtomic', function() {
     });
 });
 
-TEST_F('LiveRegionsTest', 'LiveRegionChangeAtomicText', function() {
+TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionChangeAtomicText', function() {
   LiveRegions.LIVE_REGION_QUEUE_TIME_MS = 0;
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(
@@ -136,7 +136,7 @@ TEST_F('LiveRegionsTest', 'LiveRegionChangeAtomicText', function() {
     });
 });
 
-TEST_F('LiveRegionsTest', 'LiveRegionChangeImageAlt', function() {
+TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionChangeImageAlt', function() {
   // Note that there is a live region outputted as a result of page load; the
   // test expects a live region announcement after a click on the button, but
   // the LiveRegions module has a half second filter for live region
@@ -165,7 +165,7 @@ TEST_F('LiveRegionsTest', 'LiveRegionChangeImageAlt', function() {
     });
 });
 
-TEST_F('LiveRegionsTest', 'LiveRegionThenFocus', function() {
+TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionThenFocus', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(
     function() {/*!
@@ -190,7 +190,7 @@ TEST_F('LiveRegionsTest', 'LiveRegionThenFocus', function() {
     });
 });
 
-TEST_F('LiveRegionsTest', 'FocusThenLiveRegion', function() {
+TEST_F('ChromeVoxLiveRegionsTest', 'FocusThenLiveRegion', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(
     function() {/*!
@@ -215,7 +215,7 @@ TEST_F('LiveRegionsTest', 'FocusThenLiveRegion', function() {
     });
 });
 
-TEST_F('LiveRegionsTest', 'LiveRegionCategoryFlush', function() {
+TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionCategoryFlush', function() {
   // Adjust the live region queue time to be shorter (i.e. flushes happen for
   // live regions coming 1 ms in time). Also, can help with flakeyness.
   LiveRegions.LIVE_REGION_QUEUE_TIME_MS = 1;
@@ -244,7 +244,7 @@ TEST_F('LiveRegionsTest', 'LiveRegionCategoryFlush', function() {
     });
 });
 
-TEST_F('LiveRegionsTest', 'SilentOnNodeChange', function() {
+TEST_F('ChromeVoxLiveRegionsTest', 'SilentOnNodeChange', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <p>start</p>
@@ -273,7 +273,7 @@ TEST_F('LiveRegionsTest', 'SilentOnNodeChange', function() {
   });
 });
 
-TEST_F('LiveRegionsTest', 'SimulateTreeChanges', function() {
+TEST_F('ChromeVoxLiveRegionsTest', 'SimulateTreeChanges', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <button></button>
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/log_store_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/log_store_test.extjs
index af7a2ec5975197..10c462d88d89be 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/log_store_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/log_store_test.extjs
@@ -10,15 +10,15 @@ GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js']);
  * @constructor
  * @extends {ChromeVoxE2ETestBase}
  */
-function LogStoreTest() {
+function ChromeVoxLogStoreTest() {
   ChromeVoxNextE2ETest.call(this);
 }
 
-LogStoreTest.prototype = {
+ChromeVoxLogStoreTest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 };
 
-SYNC_TEST_F('LogStoreTest', 'ShortLogs', function() {
+SYNC_TEST_F('ChromeVoxLogStoreTest', 'ShortLogs', function() {
   var logStore = new LogStore();
   for (var i = 0; i < 100; i++)
     logStore.writeTextLog('test' + i, 'speech');
@@ -29,7 +29,7 @@ SYNC_TEST_F('LogStoreTest', 'ShortLogs', function() {
     assertEquals(logs[i].toString(), 'test' + i);
 });
 
-SYNC_TEST_F('LogStoreTest', 'LongLogs', function() {
+SYNC_TEST_F('ChromeVoxLogStoreTest', 'LongLogs', function() {
   var logStore = new LogStore();
   for (var i = 0; i < LogStore.LOG_LIMIT + 500; i++)
     logStore.writeTextLog('test' + i, 'speech');
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output_test.extjs
index fb46b5bdcdb918..7d321048366f68 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output_test.extjs
@@ -90,11 +90,11 @@ function checkOutput_(expectedText, expectedSpans, actualText, actualSpans) {
  * @constructor
  * @extends {ChromeVoxNextE2ETestBase}
  */
-function OutputE2ETest() {
+function ChromeVoxOutputE2ETest() {
   ChromeVoxNextE2ETest.call(this);
 }
 
-OutputE2ETest.prototype = {
+ChromeVoxOutputE2ETest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 
   /** @override */
@@ -105,7 +105,7 @@ OutputE2ETest.prototype = {
   }
 };
 
-TEST_F('OutputE2ETest', 'Links', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'Links', function() {
   this.runWithLoadedTree('<a href="#">Click here</a>',
     function(root) {
       var el = root.firstChild.firstChild;
@@ -128,7 +128,7 @@ TEST_F('OutputE2ETest', 'Links', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'Checkbox', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'Checkbox', function() {
   this.runWithLoadedTree('<input type="checkbox">',
     function(root) {
       var el = root.firstChild.firstChild;
@@ -147,7 +147,7 @@ TEST_F('OutputE2ETest', 'Checkbox', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'InLineTextBoxValueGetsIgnored', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'InLineTextBoxValueGetsIgnored', function() {
   this.runWithLoadedTree('<p>OK',
     function(root) {
       var el = root.firstChild.firstChild.firstChild;
@@ -178,7 +178,7 @@ TEST_F('OutputE2ETest', 'InLineTextBoxValueGetsIgnored', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'Headings', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'Headings', function() {
   this.runWithLoadedTree(function() {/*!
       <h1>a</h1><h2>b</h2><h3>c</h3><h4>d</h4><h5>e</h5><h6>f</h6>
       <h1><a href="a.com">b</a></h1> */},
@@ -220,7 +220,7 @@ TEST_F('OutputE2ETest', 'Headings', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'Audio', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'Audio', function() {
   this.runWithLoadedTree('<audio src="foo.mp3" controls></audio>',
     function(root) {
       var el = root.find({role: 'button'});
@@ -267,7 +267,7 @@ TEST_F('OutputE2ETest', 'Audio', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'Input', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'Input', function() {
   this.runWithLoadedTree(
       '<input type="text"></input>' +
       '<input type="email"></input>' +
@@ -373,7 +373,7 @@ TEST_F('OutputE2ETest', 'Input', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'List', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'List', function() {
   this.runWithLoadedTree(
       '<ul><li aria-label="a">a<li>b<li>c</ul>',
     function(root) {
@@ -399,7 +399,7 @@ TEST_F('OutputE2ETest', 'List', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'Tree', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'Tree', function() {
   this.runWithLoadedTree(function() {/*!
     <ul role="tree" style="list-style-type:none">
       <li aria-expanded="true" role="treeitem">a
@@ -463,7 +463,7 @@ TEST_F('OutputE2ETest', 'Tree', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'Menu', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'Menu', function() {
   this.runWithLoadedTree(function() {/*!
     <div role="menu">
       <div role="menuitem">a</div>
@@ -486,7 +486,7 @@ TEST_F('OutputE2ETest', 'Menu', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'ListBox', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'ListBox', function() {
   this.runWithLoadedTree(function() {/*!
     <select multiple>
       <option>1</option>
@@ -512,7 +512,7 @@ TEST_F('OutputE2ETest', 'ListBox', function() {
   });
 });
 
-SYNC_TEST_F('OutputE2ETest', 'MessageIdAndEarconValidity', function() {
+SYNC_TEST_F('ChromeVoxOutputE2ETest', 'MessageIdAndEarconValidity', function() {
   const kNoBrailleMessageRequired = new Set([
     'contentDeletion',
     'contentInsertion',
@@ -593,7 +593,7 @@ SYNC_TEST_F('OutputE2ETest', 'MessageIdAndEarconValidity', function() {
   }
 });
 
-TEST_F('OutputE2ETest', 'DivOmitsRole', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'DivOmitsRole', function() {
   this.runWithLoadedTree(function() {/*!
     <div>that has content</div>
     <div></div>
@@ -612,7 +612,7 @@ TEST_F('OutputE2ETest', 'DivOmitsRole', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'LessVerboseAncestry', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'LessVerboseAncestry', function() {
   this.runWithLoadedTree(function() {/*!
     <div role="banner"><p>inside</p></div>
     <div role="banner"><p>inside</p></div>
@@ -642,7 +642,7 @@ TEST_F('OutputE2ETest', 'LessVerboseAncestry', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'Brief', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'Brief', function() {
   this.runWithLoadedTree(function() {/*!
     <div role="article"><p>inside</p></div>
   */},
@@ -656,7 +656,7 @@ TEST_F('OutputE2ETest', 'Brief', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'AuralStyledHeadings', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'AuralStyledHeadings', function() {
   function toFixed(num) {
     return parseFloat(Number(num).toFixed(1));
   }
@@ -683,7 +683,7 @@ TEST_F('OutputE2ETest', 'AuralStyledHeadings', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'ToggleButton', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'ToggleButton', function() {
   this.runWithLoadedTree(function() {/*!
       <div role="button" aria-pressed="true">Subscribe</div>*/},
     function(root) {
@@ -700,7 +700,7 @@ TEST_F('OutputE2ETest', 'ToggleButton', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'JoinDescendants', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'JoinDescendants', function() {
   this.runWithLoadedTree(function() {/*!
       <p>This</p>
       <p>fragment</p>
@@ -718,7 +718,7 @@ TEST_F('OutputE2ETest', 'JoinDescendants', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'ComplexDiv', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'ComplexDiv', function() {
   this.runWithLoadedTree(function() {/*!
       <div><button>ok</button></div>
     */},
@@ -729,7 +729,7 @@ TEST_F('OutputE2ETest', 'ComplexDiv', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'ContainerFocus', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'ContainerFocus', function() {
   this.runWithLoadedTree(function() {/*!
       <div role="row" tabindex=0 aria-label="start"></div>
       <div role="row" tabindex=0 aria-label="end"></div>
@@ -742,7 +742,7 @@ TEST_F('OutputE2ETest', 'ContainerFocus', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'BraileWhitespace', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'BraileWhitespace', function() {
   this.runWithLoadedTree(function() {/*!
     <p>this is a <em>test</em>of emphasized text</p>
   */},
@@ -765,7 +765,7 @@ TEST_F('OutputE2ETest', 'BraileWhitespace', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'BrailleAncestry', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'BrailleAncestry', function() {
   this.runWithLoadedTree(function() {/*!
     <ul><li><a href="#">test</a></li></ul>
   */},
@@ -789,7 +789,7 @@ TEST_F('OutputE2ETest', 'BrailleAncestry', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'RangeOutput', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'RangeOutput', function() {
   this.runWithLoadedTree(function(root) {/*!
     <div role="slider" aria-valuemin="1" aria-valuemax="10" aria-valuenow="2"
                        aria-label="volume"></div>
@@ -853,7 +853,7 @@ TEST_F('OutputE2ETest', 'RangeOutput', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'RoleDescription', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'RoleDescription', function() {
   this.runWithLoadedTree(function(root) {/*!
     <div aria-label="hi" role="button" aria-roledescription="foo"></div>
   */}, function(root) {
@@ -871,7 +871,7 @@ TEST_F('OutputE2ETest', 'RoleDescription', function() {
   });
 });
 
-SYNC_TEST_F('OutputE2ETest', 'ValidateCommonProperties', function() {
+SYNC_TEST_F('ChromeVoxOutputE2ETest', 'ValidateCommonProperties', function() {
   var stateStr = '$state';
   var restrictionStr = '$restriction';
   var descStr = '$description';
@@ -941,7 +941,7 @@ SYNC_TEST_F('OutputE2ETest', 'ValidateCommonProperties', function() {
   // descriptions somewhere in the output.
 });
 
-TEST_F('OutputE2ETest', 'InlineBraille', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'InlineBraille', function() {
   this.runWithLoadedTree(function(root) {/*!
     <table border=1>
       <tr><td>Name</td><td id="active">Age</td><td>Address</td></tr>
@@ -956,7 +956,7 @@ TEST_F('OutputE2ETest', 'InlineBraille', function() {
   });
 });
 
-TEST_F('OutputE2ETest', 'TextFieldObeysRoleDescription', function() {
+TEST_F('ChromeVoxOutputE2ETest', 'TextFieldObeysRoleDescription', function() {
   this.runWithLoadedTree(function(root) {/*!
     <div role="textbox" aria-roledescription="square"></div>
     <div role="region" aria-roledescription="circle"></div>
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/panel_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/panel_test.extjs
index b7cd4891876335..667bb35bf37b2d 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/panel_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/panel_test.extjs
@@ -12,11 +12,11 @@ GEN_INCLUDE(['../../testing/mock_feedback.js']);
  * @constructor
  * @extends {ChromeVoxNextE2ETest}
  */
-function PanelTest() {
+function ChromeVoxPanelTest() {
   ChromeVoxNextE2ETest.call(this);
 }
 
-PanelTest.prototype = {
+ChromeVoxPanelTest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 
   /** @override */
@@ -87,7 +87,7 @@ PanelTest.prototype = {
   */}
 };
 
-TEST_F('PanelTest', 'MAYBE_ActivateMenu', function() {
+TEST_F('ChromeVoxPanelTest', 'MAYBE_ActivateMenu', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(this.linksDoc, function(root) {
     var openMenus = new PanelCommand(PanelCommandType.OPEN_MENUS);
@@ -105,7 +105,7 @@ TEST_F('PanelTest', 'MAYBE_ActivateMenu', function() {
   });
 });
 
-TEST_F('PanelTest', 'MAYBE_LinkMenu', function() {
+TEST_F('ChromeVoxPanelTest', 'MAYBE_LinkMenu', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(this.linksDoc, function(root) {
     var openMenus = new PanelCommand(PanelCommandType.OPEN_MENUS, 'role_link');
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/recovery_strategy_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/recovery_strategy_test.extjs
index 41d70a13776289..72e6398f2956b0 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/recovery_strategy_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/recovery_strategy_test.extjs
@@ -11,16 +11,16 @@ GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js',
  * @constructor
  * @extends {ChromeVoxNextE2ETest}
  */
-function RecoveryStrategyTest() {
+function ChromeVoxRecoveryStrategyTest() {
   ChromeVoxNextE2ETest.call(this);
   window.RoleType = chrome.automation.RoleType;
 }
 
-RecoveryStrategyTest.prototype = {
+ChromeVoxRecoveryStrategyTest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 };
 
-TEST_F('RecoveryStrategyTest', 'ReparentedRecovery', function() {
+TEST_F('ChromeVoxRecoveryStrategyTest', 'ReparentedRecovery', function() {
   this.runWithLoadedTree(function() {/*!
     <input type="text"></input>
     <p id="p">hi</p>
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/tree_walker_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/tree_walker_test.extjs
index 385190352643c5..479c9363ab146b 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/tree_walker_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/tree_walker_test.extjs
@@ -12,11 +12,11 @@ GEN_INCLUDE(['../../testing/snippets.js']);
  * @constructor
  * @extends {ChromeVoxE2ETestBase}
  */
-function AutomationTreeWalkerTest() {
+function ChromeVoxAutomationTreeWalkerTest() {
   ChromeVoxNextE2ETest.call(this);
 }
 
-AutomationTreeWalkerTest.prototype = {
+ChromeVoxAutomationTreeWalkerTest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 
   flattenTree: function(node, outResult) {
@@ -45,7 +45,7 @@ AutomationTreeWalkerTest.prototype = {
   }
 };
 
-TEST_F('AutomationTreeWalkerTest', 'Forward', function() {
+TEST_F('ChromeVoxAutomationTreeWalkerTest', 'Forward', function() {
   chrome.automation.getDesktop(this.newCallback(function(d) {
     var resultList = [];
     this.flattenTree(d, resultList);
@@ -72,7 +72,7 @@ TEST_F('AutomationTreeWalkerTest', 'Forward', function() {
   }.bind(this)));
 });
 
-TEST_F('AutomationTreeWalkerTest', 'Backward', function() {
+TEST_F('ChromeVoxAutomationTreeWalkerTest', 'Backward', function() {
   chrome.automation.getDesktop(this.newCallback(function(d) {
     var resultList = [];
     this.flattenTree(d, resultList);
@@ -99,7 +99,7 @@ TEST_F('AutomationTreeWalkerTest', 'Backward', function() {
   }.bind(this)));
 });
 
-TEST_F('AutomationTreeWalkerTest', 'RootLeafRestriction', function() {
+TEST_F('ChromeVoxAutomationTreeWalkerTest', 'RootLeafRestriction', function() {
   this.runWithLoadedTree(function() {/*!
       <div role="group" aria-label="1">
         <div role="group" aria-label="2">
@@ -163,7 +163,7 @@ TEST_F('AutomationTreeWalkerTest', 'RootLeafRestriction', function() {
     });
 });
 
-TEST_F('AutomationTreeWalkerTest', 'LeafPredicateSymmetry', function() {
+TEST_F('ChromeVoxAutomationTreeWalkerTest', 'LeafPredicateSymmetry', function() {
   this.runWithLoadedTree(toolbarDoc, function(r) {
     var d = r.root.parent.root;
     var forwardWalker = new AutomationTreeWalker(d, 'forward');
@@ -185,7 +185,7 @@ TEST_F('AutomationTreeWalkerTest', 'LeafPredicateSymmetry', function() {
   });
 });
 
-TEST_F('AutomationTreeWalkerTest', 'RootPredicateEnding', function() {
+TEST_F('ChromeVoxAutomationTreeWalkerTest', 'RootPredicateEnding', function() {
   this.runWithLoadedTree(toolbarDoc, function(r) {
     var backwardWalker = new AutomationTreeWalker(r.firstChild, 'backward',
         {root: function(node) { return node === r; }});
diff --git a/chrome/browser/resources/chromeos/chromevox/host/chrome/braille_integration_test.unitjs b/chrome/browser/resources/chromeos/chromevox/host/chrome/braille_integration_test.unitjs
index 0870247b552ede..e0a93e1ea410b3 100644
--- a/chrome/browser/resources/chromeos/chromevox/host/chrome/braille_integration_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/host/chrome/braille_integration_test.unitjs
@@ -14,11 +14,11 @@ GEN_INCLUDE(['../../testing/chromevox_unittest_base.js',
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxBrailleIntegrationUnitTest() {
+function ChromeVoxBrailleIntegrationUnitTest() {
   ChromeVoxUnitTestBase.call(this);
 }
 
-CvoxBrailleIntegrationUnitTest.prototype = {
+ChromeVoxBrailleIntegrationUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -163,14 +163,15 @@ FakeInputHandler.prototype = {
 
 /** @extends {cvox.BrailleTranslatorManager} */
 function FakeTranslatorManager() {
-}        
+}
 
-SYNC_TEST_F('CvoxBrailleIntegrationUnitTest', 'Write', function() {
+SYNC_TEST_F('ChromeVoxBrailleIntegrationUnitTest', 'Write', function() {
   this.braille.write(this.content1);
   assertEqualsJSON(this.content1, this.displayManager.content);
 });
 
-SYNC_TEST_F('CvoxBrailleIntegrationUnitTest', 'WriteWithSpans', function() {
+SYNC_TEST_F('ChromeVoxBrailleIntegrationUnitTest', 'WriteWithSpans',
+            function() {
   var selectionSpan = new cvox.ValueSelectionSpan();
   var valueSpan = new cvox.ValueSpan(20);
   var toSend = cvox.NavBraille.fromText(
@@ -185,7 +186,7 @@ SYNC_TEST_F('CvoxBrailleIntegrationUnitTest', 'WriteWithSpans', function() {
   assertEqualsJSON(expected, this.displayManager.content);
 });
 
-TEST_F('CvoxBrailleIntegrationUnitTest', 'CommandNoContent', function() {
+TEST_F('ChromeVoxBrailleIntegrationUnitTest', 'CommandNoContent', function() {
   // Commands are only delivered to the content script if the window has focus.
   this.awaitDocumentFocused(function() {
     this.sendCommand(this.command1, null);
@@ -194,7 +195,7 @@ TEST_F('CvoxBrailleIntegrationUnitTest', 'CommandNoContent', function() {
   });
 });
 
-TEST_F('CvoxBrailleIntegrationUnitTest',
+TEST_F('ChromeVoxBrailleIntegrationUnitTest',
        'InterleavedWritesAndCommands',
        function() {
   this.awaitDocumentFocused(function() {
@@ -215,7 +216,7 @@ TEST_F('CvoxBrailleIntegrationUnitTest',
   });
 });
 
-TEST_F('CvoxBrailleIntegrationUnitTest', 'CommandAfterBackgroundWrite',
+TEST_F('ChromeVoxBrailleIntegrationUnitTest', 'CommandAfterBackgroundWrite',
        function() {
   this.awaitDocumentFocused(function() {
     this.braille.write(this.content1);
@@ -231,7 +232,7 @@ TEST_F('CvoxBrailleIntegrationUnitTest', 'CommandAfterBackgroundWrite',
   });
 });
 
-TEST_F('CvoxBrailleIntegrationUnitTest', 'CommandAfterOtherTabWrite',
+TEST_F('ChromeVoxBrailleIntegrationUnitTest', 'CommandAfterOtherTabWrite',
        function() {
   this.awaitDocumentFocused(function() {
     // Ignore the listener of the braille from the second 'tab'.
diff --git a/chrome/browser/resources/chromeos/chromevox/host/chrome/tts_background_test.extjs b/chrome/browser/resources/chromeos/chromevox/host/chrome/tts_background_test.extjs
index 824e3e28846d48..9bc88e39154b92 100644
--- a/chrome/browser/resources/chromeos/chromevox/host/chrome/tts_background_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/host/chrome/tts_background_test.extjs
@@ -13,15 +13,15 @@ GEN_INCLUDE(['../../testing/chromevox_e2e_test_base.js',
  * @constructor
  * @extends {ChromeVoxE2ETest}
  */
-function CvoxTtsBackgroundTest() {
+function ChromeVoxTtsBackgroundTest() {
   ChromeVoxE2ETest.call(this);
 }
 
-CvoxTtsBackgroundTest.prototype = {
+ChromeVoxTtsBackgroundTest.prototype = {
   __proto__: ChromeVoxE2ETest.prototype
 };
 
-SYNC_TEST_F('CvoxTtsBackgroundTest', 'Preprocess', function() {
+SYNC_TEST_F('ChromeVoxTtsBackgroundTest', 'Preprocess', function() {
   var tts = new cvox.TtsBackground(false);
   var preprocess = tts.preprocess.bind(tts);
 
@@ -44,7 +44,7 @@ SYNC_TEST_F('CvoxTtsBackgroundTest', 'Preprocess', function() {
   assertEquals('bullet 2 bullets', preprocess('\u2022 \u2022\u2022'));
 });
 
-TEST_F('CvoxTtsBackgroundTest', 'UpdateVoice', function() {
+TEST_F('ChromeVoxTtsBackgroundTest', 'UpdateVoice', function() {
   var tts = new cvox.TtsBackground(false);
   var voices = [
     {lang: 'zh-CN', voiceName: 'Chinese'},
@@ -95,8 +95,8 @@ TEST_F('CvoxTtsBackgroundTest', 'UpdateVoice', function() {
 });
 
 // This test only works if Google tts is installed. Run it locally.
-TEST_F(
-    'CvoxTtsBackgroundTest', 'DISABLED_EmptyStringCallsCallbacks', function() {
+TEST_F('ChromeVoxTtsBackgroundTest',
+       'DISABLED_EmptyStringCallsCallbacks', function() {
   var tts = new cvox.TtsBackground(false);
   var startCalls = 0, endCalls = 0;
   assertCallsCallbacks = function(text, speakCalls) {
diff --git a/chrome/browser/resources/chromeos/chromevox/walkers/character_walker_test.unitjs b/chrome/browser/resources/chromeos/chromevox/walkers/character_walker_test.unitjs
index d93d11a13ace09..67f58ad07577fe 100644
--- a/chrome/browser/resources/chromeos/chromevox/walkers/character_walker_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/walkers/character_walker_test.unitjs
@@ -8,16 +8,17 @@ GEN_INCLUDE(['walker_unittest_base.js']);
 /**
  * Test fixture.
  * @constructor
- * @extends {CvoxWalkerTestBase}
+ * @extends {ChromeVoxWalkerTestBase}
  */
-function CvoxCharacterWalkerUnitTest() {}
+function ChromeVoxCharacterWalkerUnitTest() {}
 
-CvoxCharacterWalkerUnitTest.prototype = {
-  __proto__: CvoxWalkerUnitTestBase.prototype,
+ChromeVoxCharacterWalkerUnitTest.prototype = {
+  __proto__: ChromeVoxWalkerUnitTestBase.prototype,
 
   /** @override */
-  closureModuleDeps: CvoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
-      'cvox.CharacterWalker'),
+  closureModuleDeps:
+      ChromeVoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
+          'cvox.CharacterWalker'),
 
   /** @override */
   newWalker: function() {
@@ -35,9 +36,9 @@ CvoxCharacterWalkerUnitTest.prototype = {
   }
 };
 
-CvoxWalkerUnitTestBase.addCommonTests('CvoxCharacterWalkerUnitTest');
+ChromeVoxWalkerUnitTestBase.addCommonTests('ChromeVoxCharacterWalkerUnitTest');
 
-TEST_F('CvoxCharacterWalkerUnitTest', 'SimpleForwardSync', function() {
+TEST_F('ChromeVoxCharacterWalkerUnitTest', 'SimpleForwardSync', function() {
   this.setUpSimpleHtml_();
 
   // invalid selection
@@ -55,7 +56,8 @@ TEST_F('CvoxCharacterWalkerUnitTest', 'SimpleForwardSync', function() {
   assertTrue(ret2.equals(ret));
 });
 
-TEST_F('CvoxCharacterWalkerUnitTest', 'testSimpleReversedSync', function() {
+TEST_F('ChromeVoxCharacterWalkerUnitTest', 'testSimpleReversedSync',
+       function() {
   this.setUpSimpleHtml_();
 
   // invalid selection
@@ -74,7 +76,7 @@ TEST_F('CvoxCharacterWalkerUnitTest', 'testSimpleReversedSync', function() {
   assertTrue(ret2.equals(ret));
 });
 
-TEST_F('CvoxCharacterWalkerUnitTest', 'testSimpleForwardNext', function() {
+TEST_F('ChromeVoxCharacterWalkerUnitTest', 'testSimpleForwardNext', function() {
   this.setUpSimpleHtml_();
 
   var sel = cvox.CursorSelection.fromNode($('a'));
@@ -88,7 +90,8 @@ TEST_F('CvoxCharacterWalkerUnitTest', 'testSimpleForwardNext', function() {
   });
 });
 
-TEST_F('CvoxCharacterWalkerUnitTest', 'testSimpleReversedNext', function() {
+TEST_F('ChromeVoxCharacterWalkerUnitTest', 'testSimpleReversedNext',
+       function() {
   this.setUpSimpleHtml_();
 
   var sel = cvox.CursorSelection.fromNode($('a'));
@@ -105,7 +108,7 @@ TEST_F('CvoxCharacterWalkerUnitTest', 'testSimpleReversedNext', function() {
 /**
  * Tests for how spaces should be navigated character by character.
  */
-TEST_F('CvoxCharacterWalkerUnitTest', 'testSpaces', function() {
+TEST_F('ChromeVoxCharacterWalkerUnitTest', 'testSpaces', function() {
   this.loadDoc(function() {/*!
     <div id="foo">a <i>b</i> c<input type="text" value="asdf"/></div>
   */});
diff --git a/chrome/browser/resources/chromeos/chromevox/walkers/group_walker_test.unitjs b/chrome/browser/resources/chromeos/chromevox/walkers/group_walker_test.unitjs
index d035f89e8c916d..d5acd2e881fc28 100644
--- a/chrome/browser/resources/chromeos/chromevox/walkers/group_walker_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/walkers/group_walker_test.unitjs
@@ -8,16 +8,17 @@ GEN_INCLUDE(['walker_unittest_base.js']);
 /**
  * Test fixture.
  * @constructor
- * @extends {CvoxWalkerTestBase}
+ * @extends {ChromeVoxWalkerTestBase}
  */
-function CvoxGroupWalkerUnitTest() {}
+function ChromeVoxGroupWalkerUnitTest() {}
 
-CvoxGroupWalkerUnitTest.prototype = {
-  __proto__: CvoxWalkerUnitTestBase.prototype,
+ChromeVoxGroupWalkerUnitTest.prototype = {
+  __proto__: ChromeVoxWalkerUnitTestBase.prototype,
 
   /** @override */
-  closureModuleDeps: CvoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
-      'cvox.GroupWalker'),
+  closureModuleDeps:
+      ChromeVoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
+          'cvox.GroupWalker'),
 
   /** @override */
   newWalker: function() {
@@ -43,9 +44,9 @@ CvoxGroupWalkerUnitTest.prototype = {
   }
 };
 
-CvoxWalkerUnitTestBase.addCommonTests('CvoxGroupWalkerUnitTest');
+ChromeVoxWalkerUnitTestBase.addCommonTests('ChromeVoxGroupWalkerUnitTest');
 
-TEST_F('CvoxGroupWalkerUnitTest', 'testSimpleForwardSync', function() {
+TEST_F('ChromeVoxGroupWalkerUnitTest', 'testSimpleForwardSync', function() {
   this.setUpSimpleHtml_();
 
   // invalid selection
@@ -57,7 +58,7 @@ TEST_F('CvoxGroupWalkerUnitTest', 'testSimpleForwardSync', function() {
   assertTrue(ret2.equals(ret));
 });
 
-TEST_F('CvoxGroupWalkerUnitTest', 'testSimpleReversedSync', function() {
+TEST_F('ChromeVoxGroupWalkerUnitTest', 'testSimpleReversedSync', function() {
   this.setUpSimpleHtml_();
 
   // invalid selection
@@ -70,7 +71,7 @@ TEST_F('CvoxGroupWalkerUnitTest', 'testSimpleReversedSync', function() {
   assertTrue(ret2.equals(ret));
 });
 
-TEST_F('CvoxGroupWalkerUnitTest', 'testSimpleForwardNext', function() {
+TEST_F('ChromeVoxGroupWalkerUnitTest', 'testSimpleForwardNext', function() {
   this.setUpSimpleHtml_();
 
   // invalid selection
@@ -79,7 +80,7 @@ TEST_F('CvoxGroupWalkerUnitTest', 'testSimpleForwardNext', function() {
   var ret = this.go(sel, 'next', {selNodeId: 'b', selReversed: false});
 });
 
-TEST_F('CvoxGroupWalkerUnitTest', 'testSimpleReversedNext', function() {
+TEST_F('ChromeVoxGroupWalkerUnitTest', 'testSimpleReversedNext', function() {
   this.setUpSimpleHtml_();
 
   // invalid selection
diff --git a/chrome/browser/resources/chromeos/chromevox/walkers/layout_line_walker_test.unitjs b/chrome/browser/resources/chromeos/chromevox/walkers/layout_line_walker_test.unitjs
index b257dd948b06df..0015312df8f106 100644
--- a/chrome/browser/resources/chromeos/chromevox/walkers/layout_line_walker_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/walkers/layout_line_walker_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxLayoutLineWalkerUnitTest() {}
+function ChromeVoxLayoutLineWalkerUnitTest() {}
 
-CvoxLayoutLineWalkerUnitTest.prototype = {
+ChromeVoxLayoutLineWalkerUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -41,23 +41,23 @@ CvoxLayoutLineWalkerUnitTest.prototype = {
     );
     Msgs = TestMsgs;
     this.walker = new cvox.LayoutLineWalker();
-  
+
     this.a = cvox.CursorSelection.fromNode($('a'));
     this.aa = cvox.CursorSelection.fromNode($('aa'));
     this.b = cvox.CursorSelection.fromNode($('b'));
     this.bb = cvox.CursorSelection.fromNode($('bb'));
-  
+
     this.line1Text = 'Demonstrating that in-line links like google are' +
         ' considered a single layout line.';
-  
+
     this.line2Text = 'This includes a paragraph that has a lot of text' +
         ' like this one. Wikipedia is a great example of a site that this' +
         ' walker becomes valuable.';
-  
+
     this.line3Text =
         'Braille also benefits greatly from this type of formatting since ' +
         'some displays can handle lots of text like 80 cell displays!';
-  
+
     this.line1Description =
         [{'context': '', 'text': 'Demonstrating that in-line links like',
           'userValue': '', 'annotation': '', 'earcons': [], 'personality': null,
@@ -68,7 +68,7 @@ CvoxLayoutLineWalkerUnitTest.prototype = {
          {'context': '', 'text': 'are considered a single layout line.',
           'userValue': '', 'annotation': '', 'earcons': [], 'personality': null,
           'hint': '', 'category': null}];
-  
+
     this.line2Description =
         [{'context': '', 'text':
           'This includes a paragraph that has a lot of text like this one.',
@@ -83,13 +83,13 @@ CvoxLayoutLineWalkerUnitTest.prototype = {
           'hint': '', 'category': null},
          {'context': '', 'text':
           'is a great example of a site that this walker becomes valuable.',
-          'userValue': '',  
+          'userValue': '',
           'annotation': '', 'earcons': [], 'personality': null,
           'hint': '', 'category': null}];
   }
 };
 
-TEST_F('CvoxLayoutLineWalkerUnitTest', 'Sync', function() {
+TEST_F('ChromeVoxLayoutLineWalkerUnitTest', 'Sync', function() {
   var sel = cvox.CursorSelection.fromNode($('1'));
   sel = this.walker.sync(sel);
   assertEquals(this.line1Text, sel.getText());
@@ -121,7 +121,7 @@ TEST_F('CvoxLayoutLineWalkerUnitTest', 'Sync', function() {
 });
 
 /** Tests description of valid selections. */
-TEST_F('CvoxLayoutLineWalkerUnitTest', 'Description', function() {
+TEST_F('ChromeVoxLayoutLineWalkerUnitTest', 'Description', function() {
   var sel = this.walker.sync(this.a);
   assertEqualsJSON(this.line1Description,
                    this.walker.getDescription(sel, sel));
@@ -132,7 +132,7 @@ TEST_F('CvoxLayoutLineWalkerUnitTest', 'Description', function() {
 
 
 /** Tests back/forward movement. */
-TEST_F('CvoxLayoutLineWalkerUnitTest', 'BackForward', function() {
+TEST_F('ChromeVoxLayoutLineWalkerUnitTest', 'BackForward', function() {
   var sel = this.walker.sync(this.a);
 
   // Beginning of second line.
diff --git a/chrome/browser/resources/chromeos/chromevox/walkers/object_walker_test.unitjs b/chrome/browser/resources/chromeos/chromevox/walkers/object_walker_test.unitjs
index 1b6fe4378a1489..aaafa932a401ae 100644
--- a/chrome/browser/resources/chromeos/chromevox/walkers/object_walker_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/walkers/object_walker_test.unitjs
@@ -8,16 +8,17 @@ GEN_INCLUDE(['walker_unittest_base.js']);
 /**
  * Test fixture.
  * @constructor
- * @extends {CvoxWalkerTestBase}
+ * @extends {ChromeVoxWalkerTestBase}
  */
-function CvoxObjectWalkerUnitTest() {}
+function ChromeVoxObjectWalkerUnitTest() {}
 
-CvoxObjectWalkerUnitTest.prototype = {
-  __proto__: CvoxWalkerUnitTestBase.prototype,
+ChromeVoxObjectWalkerUnitTest.prototype = {
+  __proto__: ChromeVoxWalkerUnitTestBase.prototype,
 
   /** @override */
-  closureModuleDeps: CvoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
-      'cvox.ObjectWalker'),
+  closureModuleDeps:
+      ChromeVoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
+          'cvox.ObjectWalker'),
 
   /** @override */
   newWalker: function() {
@@ -38,9 +39,9 @@ CvoxObjectWalkerUnitTest.prototype = {
   }
 };
 
-CvoxWalkerUnitTestBase.addCommonTests('CvoxObjectWalkerUnitTest');
+ChromeVoxWalkerUnitTestBase.addCommonTests('ChromeVoxObjectWalkerUnitTest');
 
-TEST_F('CvoxObjectWalkerUnitTest', 'testSimpleForwardSync', function() {
+TEST_F('ChromeVoxObjectWalkerUnitTest', 'testSimpleForwardSync', function() {
   this.setUpSimpleHtml_();
 
   // invalid selection
@@ -52,7 +53,7 @@ TEST_F('CvoxObjectWalkerUnitTest', 'testSimpleForwardSync', function() {
   assertTrue(ret2.equals(ret));
 });
 
-TEST_F('CvoxObjectWalkerUnitTest', 'testSimpleReversedSync', function() {
+TEST_F('ChromeVoxObjectWalkerUnitTest', 'testSimpleReversedSync', function() {
   this.setUpSimpleHtml_();
 
   // invalid selection
@@ -65,7 +66,7 @@ TEST_F('CvoxObjectWalkerUnitTest', 'testSimpleReversedSync', function() {
   assertTrue(ret2.equals(ret));
 });
 
-TEST_F('CvoxObjectWalkerUnitTest', 'testSimpleForwardNext', function() {
+TEST_F('ChromeVoxObjectWalkerUnitTest', 'testSimpleForwardNext', function() {
   this.setUpSimpleHtml_();
 
   var sel = cvox.CursorSelection.fromNode($('a'));
@@ -73,7 +74,7 @@ TEST_F('CvoxObjectWalkerUnitTest', 'testSimpleForwardNext', function() {
   var ret = this.go(sel, 'next', {selParentNodeId: 'c', selReversed: false});
 });
 
-TEST_F('CvoxObjectWalkerUnitTest', 'testSimpleReversedNext', function() {
+TEST_F('ChromeVoxObjectWalkerUnitTest', 'testSimpleReversedNext', function() {
   this.setUpSimpleHtml_();
 
   var sel = cvox.CursorSelection.fromNode($('a'));
@@ -82,7 +83,8 @@ TEST_F('CvoxObjectWalkerUnitTest', 'testSimpleReversedNext', function() {
 });
 
 /** tests for unbroken anchor link descriptions. */
-TEST_F('CvoxObjectWalkerUnitTest', 'testAnchorLinkDescriptions', function() {
+TEST_F('ChromeVoxObjectWalkerUnitTest', 'testAnchorLinkDescriptions',
+       function() {
   this.loadDoc(function() {/*!
     <a href='a1.html' id='a1'>
       This link <em>has</em> a few <strong>complications.</strong>
diff --git a/chrome/browser/resources/chromeos/chromevox/walkers/sentence_walker_test.unitjs b/chrome/browser/resources/chromeos/chromevox/walkers/sentence_walker_test.unitjs
index f8997811f95933..ac34ce166429a0 100644
--- a/chrome/browser/resources/chromeos/chromevox/walkers/sentence_walker_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/walkers/sentence_walker_test.unitjs
@@ -8,16 +8,17 @@ GEN_INCLUDE(['walker_unittest_base.js']);
 /**
  * Test fixture.
  * @constructor
- * @extends {CvoxWalkerTestBase}
+ * @extends {ChromeVoxWalkerTestBase}
  */
-function CvoxSentenceWalkerUnitTest() {}
+function ChromeVoxSentenceWalkerUnitTest() {}
 
-CvoxSentenceWalkerUnitTest.prototype = {
-  __proto__: CvoxWalkerUnitTestBase.prototype,
+ChromeVoxSentenceWalkerUnitTest.prototype = {
+  __proto__: ChromeVoxWalkerUnitTestBase.prototype,
 
   /** @override */
-  closureModuleDeps: CvoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
-      'cvox.SentenceWalker'),
+  closureModuleDeps:
+      ChromeVoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
+          'cvox.SentenceWalker'),
 
   /** @override */
   newWalker: function() {
@@ -35,9 +36,9 @@ CvoxSentenceWalkerUnitTest.prototype = {
   }
 };
 
-CvoxWalkerUnitTestBase.addCommonTests('CvoxSentenceWalkerUnitTest');
+ChromeVoxWalkerUnitTestBase.addCommonTests('ChromeVoxSentenceWalkerUnitTest');
 
-TEST_F('CvoxSentenceWalkerUnitTest', 'testSimpleForwardSync', function() {
+TEST_F('ChromeVoxSentenceWalkerUnitTest', 'testSimpleForwardSync', function() {
   this.setUpSimpleHtml_();
 
   var sel = cvox.CursorSelection.fromNode($('a'));
@@ -54,7 +55,7 @@ TEST_F('CvoxSentenceWalkerUnitTest', 'testSimpleForwardSync', function() {
   assertTrue(ret2.equals(ret));
 });
 
-TEST_F('CvoxSentenceWalkerUnitTest', 'testSimpleReversedSync', function() {
+TEST_F('ChromeVoxSentenceWalkerUnitTest', 'testSimpleReversedSync', function() {
   this.setUpSimpleHtml_();
 
   var sel = cvox.CursorSelection.fromNode($('a'));
@@ -72,7 +73,7 @@ TEST_F('CvoxSentenceWalkerUnitTest', 'testSimpleReversedSync', function() {
   assertTrue(ret2.equals(ret));
 });
 
-TEST_F('CvoxSentenceWalkerUnitTest', 'testSimpleForwardNext', function() {
+TEST_F('ChromeVoxSentenceWalkerUnitTest', 'testSimpleForwardNext', function() {
   this.setUpSimpleHtml_();
 
   var sel = cvox.CursorSelection.fromNode($('a'));
@@ -86,7 +87,7 @@ TEST_F('CvoxSentenceWalkerUnitTest', 'testSimpleForwardNext', function() {
   });
 });
 
-TEST_F('CvoxSentenceWalkerUnitTest', 'testSimpleReversedNext', function() {
+TEST_F('ChromeVoxSentenceWalkerUnitTest', 'testSimpleReversedNext', function() {
   this.setUpSimpleHtml_();
 
   var sel = cvox.CursorSelection.fromNode($('a'));
@@ -101,7 +102,7 @@ TEST_F('CvoxSentenceWalkerUnitTest', 'testSimpleReversedNext', function() {
   ret = this.go(ret, 'next', null);
 });
 
-TEST_F('CvoxSentenceWalkerUnitTest', 'testControlElements', function() {
+TEST_F('ChromeVoxSentenceWalkerUnitTest', 'testControlElements', function() {
   this.loadDoc(function() {/*!
       <div id="a"><p>Before</p><input type="text"/><p>After</p></div>
   */});
diff --git a/chrome/browser/resources/chromeos/chromevox/walkers/structural_line_walker_test.unitjs b/chrome/browser/resources/chromeos/chromevox/walkers/structural_line_walker_test.unitjs
index 7e0c59ff93f6c9..012abd1ab677ee 100644
--- a/chrome/browser/resources/chromeos/chromevox/walkers/structural_line_walker_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/walkers/structural_line_walker_test.unitjs
@@ -10,9 +10,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxStructuralLineWalkerUnitTest() {}
+function ChromeVoxStructuralLineWalkerUnitTest() {}
 
-CvoxStructuralLineWalkerUnitTest.prototype = {
+ChromeVoxStructuralLineWalkerUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -30,14 +30,14 @@ CvoxStructuralLineWalkerUnitTest.prototype = {
         <a href='google.com'>And here!</a>
       </p>
       */});
-  
+
     Msgs = TestMsgs;
-  
+
     this.walker_ = new cvox.StructuralLineWalker();
   },
 };
 
-TEST_F('CvoxStructuralLineWalkerUnitTest', 'BrailleLine', function() {
+TEST_F('ChromeVoxStructuralLineWalkerUnitTest', 'BrailleLine', function() {
   var aLink = $('1');
   var aLinkSel1 = this.walker_.sync(cvox.CursorSelection.fromNode(aLink));
   assertEquals('Click Here lnk',
@@ -58,7 +58,7 @@ TEST_F('CvoxStructuralLineWalkerUnitTest', 'BrailleLine', function() {
 
 
 /** Tests sync'ing to a line in the middle of a paragraph. */
-TEST_F('CvoxStructuralLineWalkerUnitTest', 'Sync', function() {
+TEST_F('ChromeVoxStructuralLineWalkerUnitTest', 'Sync', function() {
   var p1Sel = this.walker_.sync(
       cvox.CursorSelection.fromNode($('2')));
 
@@ -72,7 +72,7 @@ TEST_F('CvoxStructuralLineWalkerUnitTest', 'Sync', function() {
 });
 
 /** Tests syncing into an element treated as a leaf by TraverseUtil. */
-TEST_F('CvoxStructuralLineWalkerUnitTest', 'SyncTraverseUtil', function() {
+TEST_F('ChromeVoxStructuralLineWalkerUnitTest', 'SyncTraverseUtil', function() {
   this.loadDoc(function() {/*!
     <select id='leaf'>
       <option>apple
@@ -86,7 +86,7 @@ TEST_F('CvoxStructuralLineWalkerUnitTest', 'SyncTraverseUtil', function() {
 
 
 /** Tests specialized name calc with listitems with prefixes. */
-TEST_F('CvoxStructuralLineWalkerUnitTest', 'ListitemPrefixes', function() {
+TEST_F('ChromeVoxStructuralLineWalkerUnitTest', 'ListitemPrefixes', function() {
   this.loadDoc(function() {/*!
     <ol>
       <li id='li_orange'>orange
diff --git a/chrome/browser/resources/chromeos/chromevox/walkers/table_walker_test.unitjs b/chrome/browser/resources/chromeos/chromevox/walkers/table_walker_test.unitjs
index f2e9e3dceea007..5a207627f979ab 100644
--- a/chrome/browser/resources/chromeos/chromevox/walkers/table_walker_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/walkers/table_walker_test.unitjs
@@ -8,16 +8,17 @@ GEN_INCLUDE(['walker_unittest_base.js']);
 /**
  * Test fixture.
  * @constructor
- * @extends {CvoxWalkerTestBase}
+ * @extends {ChromeVoxWalkerTestBase}
  */
-function CvoxTableWalkerUnitTest() {}
+function ChromeVoxTableWalkerUnitTest() {}
 
-CvoxTableWalkerUnitTest.prototype = {
-  __proto__: CvoxWalkerUnitTestBase.prototype,
+ChromeVoxTableWalkerUnitTest.prototype = {
+  __proto__: ChromeVoxWalkerUnitTestBase.prototype,
 
   /** @override */
-  closureModuleDeps: CvoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
-      'cvox.TableWalker'),
+  closureModuleDeps:
+      ChromeVoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
+          'cvox.TableWalker'),
 
   /** @override */
   newWalker: function() {
@@ -32,7 +33,7 @@ CvoxTableWalkerUnitTest.prototype = {
 /**
  * Simple tests for TableWalker
  */
-TEST_F('CvoxTableWalkerUnitTest', 'testSimpleTableWalker', function() {
+TEST_F('ChromeVoxTableWalkerUnitTest', 'testSimpleTableWalker', function() {
   this.loadDoc(function() {/*!
     <p id="before">Before</p>
     <table id="table">
@@ -48,7 +49,7 @@ TEST_F('CvoxTableWalkerUnitTest', 'testSimpleTableWalker', function() {
 /**
  * Test navigating rows.
  */
-TEST_F('CvoxTableWalkerUnitTest', 'testNavigateRows', function() {
+TEST_F('ChromeVoxTableWalkerUnitTest', 'testNavigateRows', function() {
   this.loadDoc(function() {/*!
     <table id="table">
       <tr><td>A</td><td>1</td></tr>
@@ -68,7 +69,7 @@ TEST_F('CvoxTableWalkerUnitTest', 'testNavigateRows', function() {
 /**
  * Test navigating columns.
  */
-TEST_F('CvoxTableWalkerUnitTest', 'testNavigateCols', function() {
+TEST_F('ChromeVoxTableWalkerUnitTest', 'testNavigateCols', function() {
   this.loadDoc(function() {/*!
     <table id="table">
       <tr><td>A</td><td>1</td></tr>
diff --git a/chrome/browser/resources/chromeos/chromevox/walkers/walker_unittest_base.js b/chrome/browser/resources/chromeos/chromevox/walkers/walker_unittest_base.js
index 6efe7fa8e67d60..0e0d0992b788e8 100644
--- a/chrome/browser/resources/chromeos/chromevox/walkers/walker_unittest_base.js
+++ b/chrome/browser/resources/chromeos/chromevox/walkers/walker_unittest_base.js
@@ -9,9 +9,9 @@ GEN_INCLUDE(['../testing/chromevox_unittest_base.js']);
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
-function CvoxWalkerUnitTestBase() {}
+function ChromeVoxWalkerUnitTestBase() {}
 
-CvoxWalkerUnitTestBase.prototype = {
+ChromeVoxWalkerUnitTestBase.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
@@ -79,7 +79,8 @@ CvoxWalkerUnitTestBase.prototype = {
     if (opt_cmdOrDest instanceof cvox.CursorSelection) {
       var ret = opt_cmdOrDest;
     } else {
-      if (CvoxWalkerUnitTestBase.CMD_WHITELIST.indexOf(opt_cmdOrDest) == -1) {
+      if (ChromeVoxWalkerUnitTestBase.CMD_WHITELIST.indexOf(opt_cmdOrDest) ==
+          -1) {
         // Intentionally fail the test if there's a typo.
         throw 'Got an invalid command: "' + opt_cmdOrDest + '".';
       }
@@ -97,7 +98,7 @@ CvoxWalkerUnitTestBase.prototype = {
     }
 
     for (var key in desc) {
-      if (CvoxWalkerUnitTestBase.DESC_WHITELIST.indexOf(key) == -1) {
+      if (ChromeVoxWalkerUnitTestBase.DESC_WHITELIST.indexOf(key) == -1) {
         throw 'Invalid key in desc parameter: "' + key + '".';
       }
     }
@@ -152,14 +153,15 @@ CvoxWalkerUnitTestBase.prototype = {
  * @type {Array.string}
  * @const
  */
-CvoxWalkerUnitTestBase.CMD_WHITELIST = ['next', 'sync', 'nextRow', 'nextCol'];
+ChromeVoxWalkerUnitTestBase.CMD_WHITELIST =
+    ['next', 'sync', 'nextRow', 'nextCol'];
 
 /**
  * Whitelist for the properties that can be asserted with go().
  * @type {Array.string}
  * @const
  */
-CvoxWalkerUnitTestBase.DESC_WHITELIST = [
+ChromeVoxWalkerUnitTestBase.DESC_WHITELIST = [
   'selText', 'selNodeId', 'selParentNodeId', 'selStartIndex', 'selEndIndex',
   'selReversed', 'descText', 'descContext', 'descAnnotation', 'descUserValue',
   'descPersonality'
@@ -169,7 +171,7 @@ CvoxWalkerUnitTestBase.DESC_WHITELIST = [
  * Adds common walker tests
  * @param {string} testFixture Name of the test fixture class.
  */
-CvoxWalkerUnitTestBase.addCommonTests = function(testFixture) {
+ChromeVoxWalkerUnitTestBase.addCommonTests = function(testFixture) {
   /**
    * Ensures that syncing to the beginning and ends of the page return
    * not null.
diff --git a/chrome/browser/resources/chromeos/chromevox/walkers/word_walker_test.unitjs b/chrome/browser/resources/chromeos/chromevox/walkers/word_walker_test.unitjs
index 2da6b522982d27..62ae84e9b078bc 100644
--- a/chrome/browser/resources/chromeos/chromevox/walkers/word_walker_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/walkers/word_walker_test.unitjs
@@ -8,16 +8,17 @@ GEN_INCLUDE(['walker_unittest_base.js']);
 /**
  * Test fixture.
  * @constructor
- * @extends {CvoxWalkerTestBase}
+ * @extends {ChromeVoxWalkerTestBase}
  */
-function CvoxWordWalkerUnitTest() {}
+function ChromeVoxWordWalkerUnitTest() {}
 
-CvoxWordWalkerUnitTest.prototype = {
-  __proto__: CvoxWalkerUnitTestBase.prototype,
+ChromeVoxWordWalkerUnitTest.prototype = {
+  __proto__: ChromeVoxWalkerUnitTestBase.prototype,
 
   /** @override */
-  closureModuleDeps: CvoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
-      'cvox.WordWalker'),
+  closureModuleDeps:
+      ChromeVoxWalkerUnitTestBase.prototype.closureModuleDeps.concat(
+          'cvox.WordWalker'),
 
   /** @override */
   newWalker: function() {
@@ -35,9 +36,9 @@ CvoxWordWalkerUnitTest.prototype = {
   }
 };
 
-CvoxWalkerUnitTestBase.addCommonTests('CvoxWordWalkerUnitTest');
+ChromeVoxWalkerUnitTestBase.addCommonTests('ChromeVoxWordWalkerUnitTest');
 
-TEST_F('CvoxWordWalkerUnitTest', 'testSimpleForwardSync', function() {
+TEST_F('ChromeVoxWordWalkerUnitTest', 'testSimpleForwardSync', function() {
   this.setUpSimpleHtml_();
 
   // invalid selection
@@ -55,7 +56,7 @@ TEST_F('CvoxWordWalkerUnitTest', 'testSimpleForwardSync', function() {
   assertTrue(ret2.equals(ret));
 });
 
-TEST_F('CvoxWordWalkerUnitTest', 'testSimpleReversedSync', function() {
+TEST_F('ChromeVoxWordWalkerUnitTest', 'testSimpleReversedSync', function() {
   this.setUpSimpleHtml_();
 
   // invalid selection
@@ -74,7 +75,7 @@ TEST_F('CvoxWordWalkerUnitTest', 'testSimpleReversedSync', function() {
   assertTrue(ret2.equals(ret));
 });
 
-TEST_F('CvoxWordWalkerUnitTest', 'testSimpleForwardNext', function() {
+TEST_F('ChromeVoxWordWalkerUnitTest', 'testSimpleForwardNext', function() {
   this.setUpSimpleHtml_();
 
   var sel = cvox.CursorSelection.fromNode(document.getElementById('a'));
@@ -88,7 +89,7 @@ TEST_F('CvoxWordWalkerUnitTest', 'testSimpleForwardNext', function() {
   });
 });
 
-TEST_F('CvoxWordWalkerUnitTest', 'testSimpleReversedNext', function() {
+TEST_F('ChromeVoxWordWalkerUnitTest', 'testSimpleReversedNext', function() {
   this.setUpSimpleHtml_();
 
   var sel = cvox.CursorSelection.fromNode(document.getElementById('a'));
diff --git a/chrome/browser/resources/chromeos/select_to_speak/BUILD.gn b/chrome/browser/resources/chromeos/select_to_speak/BUILD.gn
index 2324b147ed8998..eca51cf880f6e6 100644
--- a/chrome/browser/resources/chromeos/select_to_speak/BUILD.gn
+++ b/chrome/browser/resources/chromeos/select_to_speak/BUILD.gn
@@ -98,6 +98,7 @@ manifest("select_to_speak_guest_manifest") {
   is_guest_manifest = true
 }
 
+# TODO(jamescook): Fold this into browser_tests.
 test("select_to_speak_extension_tests") {
   sources = [
     "//chrome/browser/extensions/browsertest_util.cc",
@@ -170,6 +171,15 @@ js2gtest("select_to_speak_extjs_tests") {
     "//chrome/test/data/webui/settings/fake_settings_private.js",
     "//chrome/test/data/webui/fake_chrome_event.js",
   ]
+
+  # The test base classes generate C++ code with these deps.
+  deps = [
+    "//ash",
+    "//base",
+    "//chrome/browser/chromeos",
+    "//chrome/common",
+    "//ui/keyboard",
+  ]
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 }
 
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 99440db8498c94..f99687d91bbda0 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -261,6 +261,12 @@ static_library("test_support") {
       "base/browser_process_platform_part_test_api_chromeos.h",
       "base/default_ash_event_generator_delegate.cc",
       "base/default_ash_event_generator_delegate.h",
+
+      # Only used for Chromevox tests, so only included on Chrome OS.
+      "base/extension_js_browser_test.cc",
+      "base/extension_js_browser_test.h",
+      "base/extension_load_waiter_one_shot.cc",
+      "base/extension_load_waiter_one_shot.h",
     ]
     public_deps += [
       "//ash",
@@ -1850,6 +1856,7 @@ test("browser_tests") {
         "//ash:test_support_with_content",
         "//ash/public/interfaces:test_interfaces",
         "//chrome/browser/chromeos:arc_test_support",
+        "//chrome/browser/resources/chromeos/chromevox:browser_tests",
         "//chrome/services/file_util/public/cpp:browser_tests",
         "//chromeos/components/drivefs:test_support",
         "//components/arc:arc_test_support",
diff --git a/docs/accessibility/chromevox.md b/docs/accessibility/chromevox.md
index e72c2f330e9297..c45edd559fb02a 100644
--- a/docs/accessibility/chromevox.md
+++ b/docs/accessibility/chromevox.md
@@ -16,7 +16,7 @@ To start or stop ChromeVox, press Ctrl+Alt+Z at any time.
 Code location: ```chrome/browser/resources/chromeos/chromevox```
 
 Ninja target: it's built as part of "chrome", but you can build and run
-chromevox_tests to test it (Chrome OS target only - you must have target_os =
+browser_tests to test it (Chrome OS target only - you must have target_os =
 "chromeos" in your GN args first).
 
 ## Developing On Linux
@@ -64,13 +64,15 @@ inspector.
 
 ### Running tests
 
-Build the chromevox_tests target. To run
-lots of tests in parallel, run it like this:
+Build the browser_tests target. To run lots of tests in parallel, run it like
+this:
 
-```out/Release/chromevox_tests --test-launcher-jobs=20```
+```
+out/Release/browser_tests --test-launcher-jobs=20 --gtest_filter=ChromeVox*
+```
 
-Use a test filter if you only want to run some of the tests from a
-particular test suite - for example, most of the ChromeVox Next tests
-have "E2E" in them (for "end-to-end"), so to only run those:
+Use a narrower test filter if you only want to run some of the tests. For
+example, most of the ChromeVox Next tests have "E2E" in them (for "end-to-end"),
+so to only run those:
 
-```out/Release/chromevox_tests --test-launcher-jobs=20 --gtest_filter="*E2E*"```
+```out/Release/browser_tests --test-launcher-jobs=20 --gtest_filter="*E2E*"```
diff --git a/docs/accessibility/tests.md b/docs/accessibility/tests.md
index fb1793e151c9af..854396337c4a8f 100644
--- a/docs/accessibility/tests.md
+++ b/docs/accessibility/tests.md
@@ -99,12 +99,13 @@ out/release/accessibility_unittests
 
 ## ChromeVox tests
 
-You must build with ```target_os = "chromeos"``` in your GN args.
+ChromeVox tests are part of the browser_tests suite. You must build with
+```target_os = "chromeos"``` in your GN args.
 
 To run all tests:
 ```
-autoninja -C out/release chromevox_tests
-out/release/chromevox_tests --test-launcher-jobs=10
+autoninja -C out/release browser_tests
+out/release/browser_tests --test-launcher-jobs=20 --gtest_filter=ChromeVox*
 ```
 
 ### Select-To-Speak tests
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 0323d79817be2c..b8f6bafe05fda2 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -515,7 +515,7 @@
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "shards": 20
+          "shards": 21
         },
         "test": "browser_tests"
       },
@@ -619,12 +619,6 @@
         },
         "test": "chromeos_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "chromevox_tests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1337,12 +1331,6 @@
         },
         "test": "chromeos_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "chromevox_tests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index bdcec7b56f79a5..4016830eea06ff 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -4246,7 +4246,7 @@
         ],
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "shards": 30
+          "shards": 31
         },
         "test": "browser_tests"
       },
@@ -4376,15 +4376,6 @@
         },
         "test": "chromeos_unittests"
       },
-      {
-        "args": [
-          "--test-launcher-print-test-stdio=always"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "chromevox_tests"
-      },
       {
         "args": [
           "--test-launcher-print-test-stdio=always"
@@ -5344,7 +5335,7 @@
               "os": "Ubuntu-14.04"
             }
           ],
-          "shards": 20
+          "shards": 25
         },
         "test": "browser_tests"
       },
@@ -5546,22 +5537,6 @@
         },
         "test": "chromeos_unittests"
       },
-      {
-        "args": [
-          "--test-launcher-print-test-stdio=always"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-14.04"
-            }
-          ],
-          "shards": 6
-        },
-        "test": "chromevox_tests"
-      },
       {
         "args": [
           "--test-launcher-print-test-stdio=always"
diff --git a/testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter b/testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter
index 07178d790b0d42..887b230b13f67a 100644
--- a/testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter
+++ b/testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter
@@ -33,6 +33,9 @@
 -AutomationApiTestWithDeviceScaleFactor.*
 -AutomationManagerAuraBrowserTest.*
 
+# ChromeVox not yet supported. https://crbug.com/594887
+-ChromeVox*
+
 # Touch gestures don't work in webcontents. https://crbug.com/866991.
 -TopControlsSlideControllerTest.TestScrollingMaximizedPageBeforeGoingToTabletMode
 -TopControlsSlideControllerTest.TestScrollingPage
diff --git a/testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter b/testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter
index ed2346379b1310..2481fff3899451 100644
--- a/testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter
+++ b/testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter
@@ -27,6 +27,9 @@
 -AutomationApiTestWithDeviceScaleFactor.*
 -AutomationManagerAuraBrowserTest.*
 
+# ChromeVox not yet supported. https://crbug.com/594887
+-ChromeVox*
+
 # Touch gestures don't work in webcontents. https://crbug.com/866991.
 -TopControlsSlideControllerTest.DisplayRotation
 -TopControlsSlideControllerTest.TestClosingATab
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index ba851aeb2ea86a..1ee1e1f8c9bcae 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -369,10 +369,6 @@
     "label": "//chromeos/components:chromeos_components_unittests",
     "type": "console_test_launcher",
   },
-  "chromevox_tests": {
-    "label": "//chrome/browser/resources/chromeos/chromevox:chromevox_tests",
-    "type": "windowed_test_launcher",
-  },
   "chromium_builder_asan": {
     "label": "//:chromium_builder_asan",
     "type": "additional_compile_target",
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index c5cc3ee3586a59..4ab2b24cde2a72 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -85,7 +85,7 @@
       # chromium.chromiumos
       'linux-chromeos-dbg': {
         'swarming': {
-          'shards': 20,
+          'shards': 21,
         },
       },
       # chromium.clang
@@ -182,14 +182,14 @@
         # These are very slow on the Chrome OS MSAN trybot for some reason.
         # crbug.com/865455
         'swarming': {
-          'shards': 20,
+          'shards': 25,
         },
       },
       'Linux Chromium OS ASan LSan Tests (1)': {
         # These are very slow on the ASAN trybot for some reason.
         # crbug.com/794372
         'swarming': {
-          'shards': 30,
+          'shards': 31,
         },
       },
       # client.v8.chromium
@@ -333,17 +333,6 @@
       },
     },
   },
-  'chromevox_tests': {
-    'modifications': {
-      'Linux ChromiumOS MSan Tests': {
-        # These are very slow on the Chrome OS MSAN trybot for some reason.
-        # crbug.com/865455
-        'swarming': {
-          'shards': 6,
-        },
-      },
-    },
-  },
   'components_unittests': {
     'modifications': {
       # chromium.memory
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 92a7b7bba44d24..913948f6ccf9b1 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -1708,7 +1708,6 @@
       'aura_unittests': {},
       'chromeos_components_unittests': {},
       'chromeos_unittests': {},
-      'chromevox_tests': {},
       'exo_unittests': {},
       'gl_unittests_ozone': {},
       'keyboard_unittests': {},