diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
index 169f18f921c242..f5f6608a2add91 100644
--- a/integrations/cloudbuild/build-all.yaml
+++ b/integrations/cloudbuild/build-all.yaml
@@ -19,7 +19,7 @@ steps:
           - >-
               ./scripts/build/build_examples.py --enable-flashbundle
               --target-glob '*' --skip-target-glob
-              '{tizen-*,*-tests,*-chip-test}' build --create-archives
+              '{tizen-*,*-tests*,*-chip-test}' build --create-archives
               /workspace/artifacts/
       id: CompileAll
       waitFor:
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index 7440cf90d23130..d46e775750b1d8 100644
--- a/integrations/cloudbuild/smoke-test.yaml
+++ b/integrations/cloudbuild/smoke-test.yaml
@@ -69,7 +69,7 @@ steps:
       args:
           - >-
               ./scripts/build/build_examples.py --enable-flashbundle
-              --target-glob 'linux-*' --skip-target-glob '*-tests' build
+              --target-glob 'linux-*' --skip-target-glob '*-tests*' build
               --create-archives /workspace/artifacts/
       waitFor:
           - Bootstrap
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index b0a9c5bd7c8b69..cc43e37e3989ee 100644
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -305,9 +305,9 @@ def HostTargets():
     yield target_native.Extend('all-clusters-app-nodeps', app=HostApp.ALL_CLUSTERS, **nodeps_args)
 
     test_target = Target(HostBoard.NATIVE.PlatformName(), HostBuilder)
-    for board in [HostBoard.NATIVE, HostBoard.FAKE]:
-        yield test_target.Extend(board.BoardName() + '-tests', board=board, app=HostApp.TESTS)
-        yield test_target.Extend(board.BoardName() + '-tests-clang', board=board, app=HostApp.TESTS, use_clang=True)
+    yield test_target.Extend(HostBoard.NATIVE.BoardName() + '-tests', board=HostBoard.NATIVE, app=HostApp.TESTS)
+    yield test_target.Extend(HostBoard.NATIVE.BoardName() + '-tests-clang', board=HostBoard.NATIVE, app=HostApp.TESTS, use_clang=True)
+    yield test_target.Extend(HostBoard.FAKE.BoardName() + '-tests', board=HostBoard.FAKE, app=HostApp.TESTS)
 
 
 def Esp32Targets():
diff --git a/scripts/build/builders/host.py b/scripts/build/builders/host.py
index 56de3fbeaf6525..1f487259ca2972 100644
--- a/scripts/build/builders/host.py
+++ b/scripts/build/builders/host.py
@@ -239,6 +239,11 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
         if use_clang:
             self.extra_gn_options.append('is_clang=true')
 
+            if self.board == HostBoard.FAKE:
+                # Fake uses "//build/toolchain/fake:fake_x64_gcc"
+                # so setting clang is not correct
+                raise Exception('Fake host board is always gcc (not clang)')
+
         if use_platform_mdns:
             self.extra_gn_options.append('chip_mdns="platform"')
 
diff --git a/scripts/build/testdata/build_linux_on_x64.txt b/scripts/build/testdata/build_linux_on_x64.txt
index c29e8b17fdf9fe..6633aab1c72dbc 100644
--- a/scripts/build/testdata/build_linux_on_x64.txt
+++ b/scripts/build/testdata/build_linux_on_x64.txt
@@ -149,9 +149,6 @@ PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
 # Generating linux-fake-tests
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root} '--args=chip_build_tests=true custom_toolchain="//build/toolchain/fake:fake_x64_gcc" chip_link_tests=true chip_device_platform="fake" chip_fake_platform=true' {out}/linux-fake-tests
 
-# Generating linux-fake-tests-clang
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root} '--args=is_clang=true chip_build_tests=true custom_toolchain="//build/toolchain/fake:fake_x64_gcc" chip_link_tests=true chip_device_platform="fake" chip_fake_platform=true' {out}/linux-fake-tests-clang
-
 # Generating linux-x64-address-resolve-tool
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root} {out}/linux-x64-address-resolve-tool
 
@@ -353,9 +350,6 @@ ninja -C {out}/linux-arm64-tv-casting-app-ipv6only
 # Building linux-fake-tests
 ninja -C {out}/linux-fake-tests check
 
-# Building linux-fake-tests-clang
-ninja -C {out}/linux-fake-tests-clang check
-
 # Building linux-x64-address-resolve-tool
 ninja -C {out}/linux-x64-address-resolve-tool src/lib/address_resolve:address-resolve-tool