diff --git a/preload.js b/preload.js
index 9ee45d477..c143899f3 100644
--- a/preload.js
+++ b/preload.js
@@ -30,7 +30,6 @@ window.getNodeVersion = () => configAny.node_version;
 window.sessionFeatureFlags = {
   useOnionRequests: true,
   useTestNet: isTestNet() || isTestIntegration(),
-  integrationTestEnv: isTestIntegration(),
   useClosedGroupV3: false,
   debug: {
     debugLogging: !_.isEmpty(process.env.SESSION_DEBUG),
diff --git a/ts/components/inputs/SessionInput.tsx b/ts/components/inputs/SessionInput.tsx
index 78f92d6ba..e7e5a9b66 100644
--- a/ts/components/inputs/SessionInput.tsx
+++ b/ts/components/inputs/SessionInput.tsx
@@ -414,6 +414,7 @@ export const SessionInput = (props: Props) => {
             ) : (
               <StyledPlaceholder
                 error={textErrorStyle}
+                data-testid={inputDataTestId}
                 textSize={textSize}
                 editable={editable}
                 centerText={centerText}
diff --git a/ts/types/attachments/VisualAttachment.ts b/ts/types/attachments/VisualAttachment.ts
index 4fd8c7d51..7e5227586 100644
--- a/ts/types/attachments/VisualAttachment.ts
+++ b/ts/types/attachments/VisualAttachment.ts
@@ -13,6 +13,7 @@ import { ToastUtils } from '../../session/utils';
 import { GoogleChrome } from '../../util';
 import { autoScaleForAvatar, autoScaleForThumbnail } from '../../util/attachmentsUtil';
 import { isAudio } from '../MIME';
+import { isTestIntegration } from '../../shared/env_vars';
 
 export const THUMBNAIL_SIDE = 200;
 export const THUMBNAIL_CONTENT_TYPE = 'image/png';
@@ -206,8 +207,8 @@ export async function autoScaleAvatarBlob(file: File) {
  * Shows the system file picker for images, scale the image down for avatar/opengroup measurements and return the blob objectURL on success
  */
 export async function pickFileForAvatar(): Promise<string | null> {
-  if (window.sessionFeatureFlags.integrationTestEnv) {
-    window.log.info(
+  if (isTestIntegration()) {
+    window.log.warn(
       'shorting pickFileForAvatar as it does not work in playwright/notsending the filechooser event'
     );
 
diff --git a/ts/window.d.ts b/ts/window.d.ts
index e7f973264..b7281c1dc 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -34,7 +34,6 @@ declare global {
       useOnionRequests: boolean;
       useTestNet: boolean;
       useClosedGroupV3: boolean;
-      integrationTestEnv: boolean;
       debug: {
         debugLogging: boolean;
         debugLibsessionDumps: boolean;