diff --git a/js/components/ascribe_app.js b/js/components/ascribe_app.js
index 863bffc0..87ab1daf 100644
--- a/js/components/ascribe_app.js
+++ b/js/components/ascribe_app.js
@@ -23,7 +23,7 @@ let AscribeApp = React.createClass({
         const { activeRoute, children, currentUser, routes, whitelabel } = this.props;
 
         return (
-            <div className="ascribe-default-app">
+            <div className="ascribe-app ascribe-default-app">
                 <Header
                     currentUser={currentUser}
                     routes={routes}
diff --git a/js/components/whitelabel/prize/portfolioreview/pr_app.js b/js/components/whitelabel/prize/portfolioreview/pr_app.js
index dcb95892..d8b9f982 100644
--- a/js/components/whitelabel/prize/portfolioreview/pr_app.js
+++ b/js/components/whitelabel/prize/portfolioreview/pr_app.js
@@ -56,7 +56,7 @@ let PRApp = React.createClass({
         return (
             <div
                 style={style}
-                className={classNames('ascribe-prize-app', `route--${(path ? path.split('/')[0] : 'landing')}`)}>
+                className={classNames('ascribe-app', 'ascribe-prize-app', `route--${(path ? path.split('/')[0] : 'landing')}`)}>
                 {header}
                 <AppRouteWrapper
                     currentUser={currentUser}
diff --git a/js/components/whitelabel/prize/simple_prize/prize_app.js b/js/components/whitelabel/prize/simple_prize/prize_app.js
index 7a7c5cbb..7e0facc9 100644
--- a/js/components/whitelabel/prize/simple_prize/prize_app.js
+++ b/js/components/whitelabel/prize/simple_prize/prize_app.js
@@ -44,7 +44,7 @@ let PrizeApp = React.createClass({
         }
 
         return (
-            <div className={classNames('ascribe-prize-app', `route--${(path ? path.split('/')[0] : 'landing')}`)}>
+            <div className={classNames('ascribe-app', 'ascribe-prize-app', `route--${(path ? path.split('/')[0] : 'landing')}`)}>
                 {header}
                 <AppRouteWrapper
                     currentUser={currentUser}
diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js
index b9663772..c5f732c3 100644
--- a/js/components/whitelabel/wallet/wallet_app.js
+++ b/js/components/whitelabel/wallet/wallet_app.js
@@ -46,7 +46,7 @@ let WalletApp = React.createClass({
         // In react-router 1.0, Routes have no 'name' property anymore. To keep functionality however,
         // we split the path by the first occurring slash and take the first splitter.
         return (
-            <div className={classNames('ascribe-wallet-app', `route--${(path ? path.split('/')[0] : 'landing')}`)}>
+            <div className={classNames('ascribe-app', 'ascribe-wallet-app', `route--${(path ? path.split('/')[0] : 'landing')}`)}>
                 {header}
                 <AppRouteWrapper
                     currentUser={currentUser}
diff --git a/test/gemini/tests/main/authenticated.js b/test/gemini/tests/main/authenticated.js
index 95eb62bd..28e4b120 100644
--- a/test/gemini/tests/main/authenticated.js
+++ b/test/gemini/tests/main/authenticated.js
@@ -15,9 +15,7 @@ gemini.suite('Authenticated', (suite) => {
         .before((actions, find) => {
             // This will be called before every nested suite begins unless that suite
             // also defines a `.before()`
-            // FIXME: use a more generic class for this, like just '.app',
-            // when we can use this file with the whitelabels
-            actions.waitForElementToShow('.ascribe-default-app', TIMEOUTS.NORMAL);
+            actions.waitForElementToShow('.ascribe-app', TIMEOUTS.NORMAL);
         });
 
     // Suite just to log us in before any other suites run
diff --git a/test/gemini/tests/main/basic.js b/test/gemini/tests/main/basic.js
index 5657f77f..fd07af2b 100644
--- a/test/gemini/tests/main/basic.js
+++ b/test/gemini/tests/main/basic.js
@@ -15,8 +15,7 @@ gemini.suite('Basic', (suite) => {
         .before((actions, find) => {
             // This will be called before every nested suite begins unless that suite
             // also defines a `.before()`
-            // FIXME: use a more generic class for this, like just '.ascribe-app'
-            actions.waitForElementToShow('.ascribe-default-app', TIMEOUTS.NORMAL);
+            actions.waitForElementToShow('.ascribe-app', TIMEOUTS.NORMAL);
         });
 
     gemini.suite('Header-desktop', (headerSuite) => {
diff --git a/test/gemini/tests/main/detail.js b/test/gemini/tests/main/detail.js
index 39e83d70..1a51836b 100644
--- a/test/gemini/tests/main/detail.js
+++ b/test/gemini/tests/main/detail.js
@@ -19,9 +19,7 @@ gemini.suite('Work detail', (suite) => {
         .before((actions, find) => {
             // This will be called before every nested suite begins unless that suite
             // also defines a `.before()`
-            // FIXME: use a more generic class for this, like just '.app',
-            // when we can use this file with the whitelabels
-            actions.waitForElementToShow('.ascribe-default-app', TIMEOUTS.NORMAL);
+            actions.waitForElementToShow('.ascribe-app', TIMEOUTS.NORMAL);
 
             // Wait for the social media buttons to appear
             actions.waitForElementToShow('.ascribe-social-button-list .fb-share-button iframe', TIMEOUTS.SUPER_DUPER_EXTRA_LONG);
@@ -58,7 +56,7 @@ gemini.suite('Work detail', (suite) => {
             .setUrl('/login')
             .ignoreElements('.ascribe-body')
             .before((actions, find) => {
-                actions.waitForElementToShow('.ascribe-default-app', TIMEOUTS.NORMAL);
+                actions.waitForElementToShow('.ascribe-app', TIMEOUTS.NORMAL);
             })
             .capture('logged in', (actions, find) => {
                 actions.sendKeys(find('.ascribe-login-wrapper input[name=email]'), MAIN_USER.email);
@@ -125,7 +123,7 @@ gemini.suite('Work detail', (suite) => {
             .setUrl('/logout')
             .ignoreElements('.ascribe-body')
             .before((actions, find) => {
-                actions.waitForElementToShow('.ascribe-default-app', TIMEOUTS.NORMAL);
+                actions.waitForElementToShow('.ascribe-app', TIMEOUTS.NORMAL);
             })
             .capture('logout', (actions, find) => {
                 actions.waitForElementToShow('.ascribe-login-wrapper', TIMEOUTS.LONG);
diff --git a/test/gemini/tests/whitelabel/23vivi/23vivi.js b/test/gemini/tests/whitelabel/23vivi/23vivi.js
index 99efb310..9d0c397e 100644
--- a/test/gemini/tests/whitelabel/23vivi/23vivi.js
+++ b/test/gemini/tests/whitelabel/23vivi/23vivi.js
@@ -9,11 +9,10 @@ const TIMEOUTS = environment.TIMEOUTS;
  */
 gemini.suite('23vivi', (suite) => {
     suite
-        //TODO: maybe this should be changed to .ascribe-body once the PR that does this is merged
-        .setCaptureElements('.ascribe-wallet-app')
+        .setCaptureElements('.ascribe-body')
         .before((actions, find) => {
             // This will be called before every nested suite begins
-            actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL);
+            actions.waitForElementToShow('.ascribe-app', TIMEOUTS.NORMAL);
         });
 
     gemini.suite('Landing', (landingSuite) => {
diff --git a/test/gemini/tests/whitelabel/cyland/cyland.js b/test/gemini/tests/whitelabel/cyland/cyland.js
index 8159f53e..9228186a 100644
--- a/test/gemini/tests/whitelabel/cyland/cyland.js
+++ b/test/gemini/tests/whitelabel/cyland/cyland.js
@@ -9,11 +9,10 @@ const TIMEOUTS = environment.TIMEOUTS;
  */
 gemini.suite('Cyland', (suite) => {
     suite
-        //TODO: maybe this should be changed to .ascribe-body once the PR that does this is merged
-        .setCaptureElements('.ascribe-wallet-app')
+        .setCaptureElements('.ascribe-body')
         .before((actions, find) => {
             // This will be called before every nested suite begins
-            actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL);
+            actions.waitForElementToShow('.ascribe-app', TIMEOUTS.NORMAL);
         });
 
     gemini.suite('Landing', (landingSuite) => {
diff --git a/test/gemini/tests/whitelabel/ikonotv/ikonotv.js b/test/gemini/tests/whitelabel/ikonotv/ikonotv.js
index 84d743c0..81e936e9 100644
--- a/test/gemini/tests/whitelabel/ikonotv/ikonotv.js
+++ b/test/gemini/tests/whitelabel/ikonotv/ikonotv.js
@@ -10,11 +10,10 @@ const TIMEOUTS = environment.TIMEOUTS;
  */
 gemini.suite('Ikonotv', (suite) => {
     suite
-        //TODO: maybe this should be changed to .ascribe-body once the PR that does this is merged
-        .setCaptureElements('.ascribe-wallet-app')
+        .setCaptureElements('.ascribe-body')
         .before((actions, find) => {
             // This will be called before every nested suite begins
-            actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL);
+            actions.waitForElementToShow('.ascribe-app', TIMEOUTS.NORMAL);
         });
 
     gemini.suite('Landing', (landingSuite) => {
@@ -40,13 +39,11 @@ gemini.suite('Ikonotv', (suite) => {
     // its logo to appear
     gemini.suite('Ikonotv basic', (suite) => {
         suite
-            .setCaptureElements('.ascribe-wallet-app')
+            .setCaptureElements('.ascribe-app')
             .before((actions, find) => {
                 // This will be called before every nested suite begins unless that suite
                 // also defines a `.before()`
-                // FIXME: use a more generic class for this, like just '.app',
-                // when we can use this file with the whitelabels
-                actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL);
+                actions.waitForElementToShow('.ascribe-app', TIMEOUTS.NORMAL);
 
                 // Wait for the forms to appear
                 actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL);
diff --git a/test/gemini/tests/whitelabel/lumenus/lumenus.js b/test/gemini/tests/whitelabel/lumenus/lumenus.js
index 8e8f568d..b15f31ee 100644
--- a/test/gemini/tests/whitelabel/lumenus/lumenus.js
+++ b/test/gemini/tests/whitelabel/lumenus/lumenus.js
@@ -9,11 +9,10 @@ const TIMEOUTS = environment.TIMEOUTS;
  */
 gemini.suite('Lumenus', (suite) => {
     suite
-        //TODO: maybe this should be changed to .ascribe-body once the PR that does this is merged
-        .setCaptureElements('.ascribe-wallet-app')
+        .setCaptureElements('.ascribe-body')
         .before((actions, find) => {
             // This will be called before every nested suite begins
-            actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL);
+            actions.waitForElementToShow('.ascribe-app', TIMEOUTS.NORMAL);
         });
 
     gemini.suite('Landing', (landingSuite) => {