diff --git a/app/scripts/background.js b/app/scripts/background.js
index ed546dc26..f5ae0ae15 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -56,7 +56,7 @@ const openMetamaskTabsIDs = {};
 const requestAccountTabIds = {};
 
 // state persistence
-const inTest = process.env.IN_TEST === 'true';
+const inTest = process.env.IN_TEST;
 const localStore = inTest ? new ReadOnlyNetworkStore() : new LocalStore();
 let versionedData;
 
diff --git a/app/scripts/controllers/network/createJsonRpcClient.js b/app/scripts/controllers/network/createJsonRpcClient.js
index f4ca59157..d4e412b8f 100644
--- a/app/scripts/controllers/network/createJsonRpcClient.js
+++ b/app/scripts/controllers/network/createJsonRpcClient.js
@@ -10,7 +10,7 @@ import {
 import { PollingBlockTracker } from 'eth-block-tracker';
 import { SECOND } from '../../../../shared/constants/time';
 
-const inTest = process.env.IN_TEST === 'true';
+const inTest = process.env.IN_TEST;
 const blockTrackerOpts = inTest ? { pollingInterval: SECOND } : {};
 const getTestMiddlewares = () => {
   return inTest ? [createEstimateGasDelayTestMiddleware()] : [];
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
index 9423c6a80..10fd9f824 100644
--- a/app/scripts/controllers/network/network.js
+++ b/app/scripts/controllers/network/network.js
@@ -33,7 +33,7 @@ const env = process.env.METAMASK_ENV;
 const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
 
 let defaultProviderConfigOpts;
-if (process.env.IN_TEST === 'true') {
+if (process.env.IN_TEST) {
   defaultProviderConfigOpts = {
     type: NETWORK_TYPE_RPC,
     rpcUrl: 'http://localhost:8545',
diff --git a/development/build/scripts.js b/development/build/scripts.js
index cf49dd302..c0b83b1a2 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -779,7 +779,7 @@ function getEnvironmentVariables({ buildType, devMode, testing }) {
     METAMASK_VERSION: version,
     METAMASK_BUILD_TYPE: buildType,
     NODE_ENV: devMode ? ENVIRONMENT.DEVELOPMENT : ENVIRONMENT.PRODUCTION,
-    IN_TEST: testing ? 'true' : false,
+    IN_TEST: testing,
     PUBNUB_SUB_KEY: process.env.PUBNUB_SUB_KEY || '',
     PUBNUB_PUB_KEY: process.env.PUBNUB_PUB_KEY || '',
     CONF: devMode ? metamaskrc : {},
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js
index 1f6037c26..fe4480f10 100644
--- a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js
@@ -29,7 +29,7 @@ const EditGasFeePopover = () => {
       className="edit-gas-fee-popover"
     >
       <>
-        {process.env.IN_TEST === 'true' ? null : <LoadingHeartBeat />}
+        {process.env.IN_TEST ? null : <LoadingHeartBeat />}
         <div className="edit-gas-fee-popover__wrapper">
           <div className="edit-gas-fee-popover__content">
             {balanceError && (
diff --git a/ui/components/app/edit-gas-popover/edit-gas-popover.component.js b/ui/components/app/edit-gas-popover/edit-gas-popover.component.js
index 60b73d170..314627cec 100644
--- a/ui/components/app/edit-gas-popover/edit-gas-popover.component.js
+++ b/ui/components/app/edit-gas-popover/edit-gas-popover.component.js
@@ -261,7 +261,7 @@ export default function EditGasPopover({
           <EditGasDisplayEducation />
         ) : (
           <>
-            {process.env.IN_TEST === 'true' ? null : <LoadingHeartBeat />}
+            {process.env.IN_TEST ? null : <LoadingHeartBeat />}
             <EditGasDisplay
               showEducationButton={showEducationButton}
               warning={warning}
diff --git a/ui/helpers/utils/i18n-helper.js b/ui/helpers/utils/i18n-helper.js
index d9d7a35a8..cfc385f0c 100644
--- a/ui/helpers/utils/i18n-helper.js
+++ b/ui/helpers/utils/i18n-helper.js
@@ -32,7 +32,7 @@ export const getMessage = (localeCode, localeMessages, key, substitutions) => {
         );
         Sentry.captureException(missingMessageErrors[key]);
         log.error(missingMessageErrors[key]);
-        if (process.env.IN_TEST === 'true') {
+        if (process.env.IN_TEST) {
           throw missingMessageErrors[key];
         }
       }
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
index 39ae8bd59..976bbeb3e 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -68,7 +68,7 @@ const EIP_1559_V2_ENABLED =
   process.env.EIP_1559_V2 === true || process.env.EIP_1559_V2 === 'true';
 
 const renderHeartBeatIfNotInTest = () =>
-  process.env.IN_TEST === 'true' ? null : <LoadingHeartBeat />;
+  process.env.IN_TEST ? null : <LoadingHeartBeat />;
 
 export default class ConfirmTransactionBase extends Component {
   static contextTypes = {
diff --git a/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.js b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.js
index 72f9a780e..2cdf2c5ea 100644
--- a/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.js
+++ b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.js
@@ -17,8 +17,7 @@ import TransactionDetailItem from '../../../components/app/transaction-detail-it
 import UserPreferencedCurrencyDisplay from '../../../components/app/user-preferenced-currency-display';
 import { useGasFeeContext } from '../../../contexts/gasFee';
 
-const HeartBeat = () =>
-  process.env.IN_TEST === 'true' ? null : <LoadingHeartBeat />;
+const HeartBeat = () => (process.env.IN_TEST ? null : <LoadingHeartBeat />);
 
 const GasDetailsItem = ({
   hexMaximumTransactionFee,
diff --git a/ui/pages/import-token/import-token.container.js b/ui/pages/import-token/import-token.container.js
index 007fa84a5..f6fa265f1 100644
--- a/ui/pages/import-token/import-token.container.js
+++ b/ui/pages/import-token/import-token.container.js
@@ -22,9 +22,7 @@ const mapStateToProps = (state) => {
   const showSearchTabCustomNetwork =
     useTokenDetection && Boolean(Object.keys(tokenList).length);
   const showSearchTab =
-    getIsMainnet(state) ||
-    showSearchTabCustomNetwork ||
-    process.env.IN_TEST === 'true';
+    getIsMainnet(state) || showSearchTabCustomNetwork || process.env.IN_TEST;
   return {
     identities,
     mostRecentOverviewPage: getMostRecentOverviewPage(state),