diff --git a/Makefile.in b/Makefile.in
index f8c0bc59dcb3..9a53bd6881bf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,7 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uic
 .PHONY : check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
 
 MAKECMDGOALS?=build
-build_goal:=$(if $(filter build build-nocheck uicheck,$(MAKECMDGOALS)),build)\
+build_goal:=$(if $(filter build uicheck,$(MAKECMDGOALS)),build)\
  $(if $(filter check,$(MAKECMDGOALS)),unitcheck slowcheck subsequentcheck $(if $(filter Linux, $(shell uname)), uicheck))\
  $(filter build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS))
 
@@ -291,7 +291,7 @@ ifeq ($(OS),iOS)
 	$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios
 endif
 
-build-non-l10n-only build-l10n-only build-nocheck check debugrun translations packageinfo $(gb_Top_MODULE_CHECK_TARGETS): build
+build-non-l10n-only build-l10n-only check debugrun translations packageinfo $(gb_Top_MODULE_CHECK_TARGETS): build
 
 help showmodules gbuildtojson:
 	$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index b7c290cb8285..26f0c87f6855 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -1314,7 +1314,7 @@ class QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
         xml += QtCreatorIntegrationGenerator.build_configs_template % {
             'index': '7',
             'base_folder': self.base_folder,
-            'arg': "build-nocheck",
+            'arg': "",
             'name': "8-Global build -- nocheck",
         }
         xml += QtCreatorIntegrationGenerator.build_configs_template % {
@@ -1373,7 +1373,7 @@ class QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
         xml += QtCreatorIntegrationGenerator.build_configs_template % {
             'index': '6',
             'base_folder': self.base_folder,
-            'arg': "build-nocheck",
+            'arg': "",
             'name': "07-Global build -- nocheck",
         }
         xml += QtCreatorIntegrationGenerator.build_configs_template % {
diff --git a/bin/update_pch_autotune.sh b/bin/update_pch_autotune.sh
index ab9b0a688067..806e1ad17767 100755
--- a/bin/update_pch_autotune.sh
+++ b/bin/update_pch_autotune.sh
@@ -165,7 +165,7 @@ for module in $modules; do
         then
             # Build all!
             echo "Failed to build $module with dependencies, building all..."
-            $MAKE build-nocheck > /dev/null
+            $MAKE > /dev/null
             if [ $? -ne 0 ];
             then
                 >&2 echo "Broken build. Please revert changes and try again."
diff --git a/osx/soffice.xcodeproj/project.pbxproj b/osx/soffice.xcodeproj/project.pbxproj
index 4ea3b7880db6..7cf857dce7f7 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -2407,7 +2407,7 @@
 /* Begin PBXLegacyTarget section */
 		BEC3D91E1710B11E0030AD56 /* soffice */ = {
 			isa = PBXLegacyTarget;
-			buildArgumentsString = "build-nocheck";
+			buildArgumentsString = "";
 			buildConfigurationList = BEC3D9211710B11E0030AD56 /* Build configuration list for PBXLegacyTarget "soffice" */;
 			buildPhases = (
 			);
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 87bb0b6c23fd..b56111126b80 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -694,7 +694,7 @@
             "buildsystem": "simple",
             "build-commands": [
                 "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak",
-                "make $(if test \"$FLATPAK_ARCH\" = i386; then printf build-nocheck; fi)",
+                "make",
                 "make distro-pack-install",
                 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
                 "printf '<?xml version=\"1.0\"?>\\n<oor:data xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:oor=\"http://openoffice.org/2001/registry\"><dependency file=\"main\"/><oor:component-data oor:name=\"Common\" oor:package=\"org.openoffice.Office\"><node oor:name=\"Misc\"><prop oor:name=\"UseOpenCL\"><value>false</value></prop></node></oor:component-data></oor:data>' >/app/libreoffice/share/registry/flatpak.xcd"