diff --git a/docs/changelog.md b/docs/changelog.md
index aadce523d..c1104f470 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -15,6 +15,10 @@ SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades <carles.fernandez@cttc
 - The software can now be built against the GNU Radio 3.9 API that uses C++11
   smart pointers instead of Boost smart pointers.
 
+### Improvements in Portability:
+
+- The software can now be cross-compiled on Petalinux environments.   
+
 ### Improvements in Reproducibility:
 
 - Improved reproducibility of the volk_gnsssdr library: Drop compile-time CPU
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index c668ede2b..cbfe33654 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -677,7 +677,9 @@ if(ENABLE_SYSTEM_TESTING)
         )
         add_system_test(position_test)
         if(NOT GNSSSIMULATOR_FOUND OR ENABLE_GNSS_SIM_INSTALL)
-            add_dependencies(position_test gnss-sim)
+            if(NOT CMAKE_CROSSCOMPILING)
+                add_dependencies(position_test gnss-sim)
+            endif()
         endif()
     else()
         # Avoid working with old executables if they were switched ON and then OFF