diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 04274cad4109..143384ddc994 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -104,12 +104,12 @@
 #endif
 #endif
 #ifdef MOZ_GTK
+@BINPATH@/glxtest
 @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
 #ifdef MOZ_WAYLAND
 @BINPATH@/@DLL_PREFIX@mozwayland@DLL_SUFFIX@
-#endif
 @BINPATH@/vaapitest
-@BINPATH@/glxtest
+#endif
 #endif
 
 ; We don't have a complete view of which dlls to expect when doing an artifact
diff --git a/widget/gtk/GfxInfo.cpp b/widget/gtk/GfxInfo.cpp
index 9eae4e39c1b5..341d6b64625c 100644
--- a/widget/gtk/GfxInfo.cpp
+++ b/widget/gtk/GfxInfo.cpp
@@ -554,7 +554,8 @@ void GfxInfo::GetData() {
   AddCrashReportAnnotations();
 }
 
-int fire_vaapi_process(const char* aRenderDevicePath, int* aOutPipe) {
+#ifdef MOZ_WAYLAND
+static int fire_vaapi_process(const char* aRenderDevicePath, int* aOutPipe) {
   nsCOMPtr<nsIFile> appFile;
   nsresult rv = XRE_GetBinaryPath(getter_AddRefs(appFile));
   if (NS_FAILED(rv)) {
@@ -705,6 +706,7 @@ void GfxInfo::GetDataVAAPI() {
     }
   }
 }
+#endif
 
 const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
   if (!sDriverInfo->Length()) {
@@ -1132,7 +1134,9 @@ nsresult GfxInfo::GetFeatureStatusImpl(
   // Probe VA-API on supported devices only
   if (aFeature == nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING &&
       *aStatus == nsIGfxInfo::FEATURE_STATUS_OK) {
+#ifdef MOZ_WAYLAND
     GetDataVAAPI();
+#endif
     if (!mIsVAAPISupported.value()) {
       *aStatus = nsIGfxInfo::FEATURE_BLOCKED_PLATFORM_TEST;
       aFailureId = "FEATURE_FAILURE_VIDEO_DECODING_TEST_FAILED";
diff --git a/widget/gtk/GfxInfo.h b/widget/gtk/GfxInfo.h
index cb8d18b81bf4..f8daa5e700f3 100644
--- a/widget/gtk/GfxInfo.h
+++ b/widget/gtk/GfxInfo.h
@@ -114,7 +114,9 @@ class GfxInfo final : public GfxInfoBase {
   bool mGlxTestError;
   mozilla::Maybe<bool> mIsVAAPISupported;
 
+#ifdef MOZ_WAYLAND
   void GetDataVAAPI();
+#endif
   void AddCrashReportAnnotations();
 };