diff --git a/client/coral-ui/components/Drawer.js b/client/coral-ui/components/Drawer.js
index bada98a1f..a32a4710e 100644
--- a/client/coral-ui/components/Drawer.js
+++ b/client/coral-ui/components/Drawer.js
@@ -6,7 +6,8 @@ import styles from './Drawer.css';
 const Drawer = ({children, onClose, className = ''}) => {
   return (
     <div className={cn(styles.drawer, className)}>
-      <div className={styles.closeButton} onClick={onClose}>×</div>
+      {/* TODO: Swap out with button */}
+      <div className={cn(styles.closeButton, [className, 'close-button'].join('-'))} onClick={onClose}>×</div>
       <div className={styles.content}>
         {children}
       </div>
diff --git a/config.js b/config.js
index 21f62d696..cb9d6c84d 100644
--- a/config.js
+++ b/config.js
@@ -7,9 +7,12 @@
 // entrypoint for the entire applications configuration.
 require('env-rewrite').rewrite();
 
-// Apply all the configuration provided in the .env file if it isn't already
-// in the environment.
-require('dotenv').config();
+if (process.env.NODE_ENV === 'development') {
+
+  // Apply all the configuration provided in the .env file if it isn't already
+  // in the environment.
+  require('dotenv').config();
+}
 
 const uniq = require('lodash/uniq');
 const ms = require('ms');
diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js
index 7aeefa190..1903ae7e8 100644
--- a/test/e2e/page_objects/admin.js
+++ b/test/e2e/page_objects/admin.js
@@ -123,11 +123,12 @@ module.exports = {
     userDetailDrawer: {
       selector: '.talk-admin-user-detail-drawer',
       elements: {
+        'closeButton': '.talk-admin-user-detail-drawer-close-button',
         'tabBar': '.talk-admin-user-detail-tab-bar',
         'allTab': '.talk-admin-user-detail-all-tab',
         'rejectedTab': '.talk-admin-user-detail-rejected-tab',
-        'historyTab': '.talk-admin-user-detail-history-tab', 
-        'historyPane': '.talk-admin-user-detail-history-tab-pane', 
+        'historyTab': '.talk-admin-user-detail-history-tab',
+        'historyPane': '.talk-admin-user-detail-history-tab-pane',
         'accountHistory': '.talk-admin-account-history',
         'accountHistoryRowStatus':'.talk-admin-account-history-row-status',
         'actionsMenu': '.talk-admin-user-detail-actions-button',
diff --git a/test/e2e/specs/06_suspendUser.js b/test/e2e/specs/06_suspendUser.js
index 742d03016..7c1321b38 100644
--- a/test/e2e/specs/06_suspendUser.js
+++ b/test/e2e/specs/06_suspendUser.js
@@ -83,7 +83,7 @@ module.exports = {
   'admin suspends user': (client) => {
     const adminPage = client.page.admin();
     const {moderate, userDetailDrawer} = adminPage.section;
-    
+
     adminPage
       .navigate()
       .ready()
@@ -100,7 +100,7 @@ module.exports = {
       .waitForElementVisible('@actionItemSuspendUser')
       .click('@actionItemSuspendUser');
 
-    adminPage 
+    adminPage
       .waitForElementVisible('@suspendUserDialog')
       .waitForElementVisible('@suspendUserDialogStep0')
       .waitForElementVisible('@suspendUserConfirmButton')
@@ -133,7 +133,8 @@ module.exports = {
       .waitForElementVisible('@historyTab')
       .click('@historyTab')
       .waitForElementVisible('@historyPane')
-      .waitForElementVisible('@accountHistory');
+      .waitForElementVisible('@accountHistory')
+      .click('@closeButton');
   },
   'admin logs out': (client) => {
     const adminPage = client.page.admin();