diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33fc2dfa8a..a0b3d5278c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -858,7 +858,7 @@ else()
     endif()
 endif()
 
-if(DEFAULT_TESTED_PLATFORM)
+if(DEFAULT_TESTED_PLATFORM AND NOT SKIP_NEO_UNIT_TESTS)
   add_subdirectory_unique(unit_tests ${NEO_BUILD_DIR}/unit_tests)
 else()
   hide_subdir(unit_tests)
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index 3a8380d6bd..5f5291fbb6 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -17,7 +17,7 @@ components:
     branch: infra
     clean_on_sync: true
     dest_dir: infra
-    revision: 58054f40ab6ff14fc86a3fa5e95a34eb124696aa
+    revision: 1c8a06a9acd8609850619ad0060314b47be4488e
     type: git
   internal:
     branch: master