diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2a6235fbc..51533fe17f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ if(MSVC OR MSVC_IDE)
 else()
     # Add some generic warnings common to all compilers
     set(CMAKE_CXX_FLAGS
-        "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Wno-unknown-pragmas -Wno-error=deprecated-declarations -Wno-switch-bool")
+        "${CMAKE_CXX_FLAGS} -Wall -Wpedantic -Wextra -Wno-unknown-pragmas -Wno-error=deprecated-declarations -Wno-switch-bool")
     # Add compiler specific options
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
@@ -82,6 +82,10 @@ else()
         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl")
     endif()
 
+    if(EPROSIMA_EXTRA_CMAKE_CXX_FLAGS)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EPROSIMA_EXTRA_CMAKE_CXX_FLAGS}")
+    endif()
+
     if(EPROSIMA_BUILD)
         string(REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
     endif()
diff --git a/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.hpp b/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.hpp
index c57c7162c0..f915227ca5 100644
--- a/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.hpp
+++ b/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.hpp
@@ -42,7 +42,8 @@ class NetworkFactory
 {
 public:
 
-    NetworkFactory()
+    NetworkFactory(
+            const RTPSParticipantAttributes&)
     {
     }
 
diff --git a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
index 5bf03ed913..8008681d10 100644
--- a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
+++ b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
@@ -131,7 +131,10 @@ class RTPSParticipantImpl
 
     MOCK_CONST_METHOD0(getGuid, const GUID_t& ());
 
-    MOCK_CONST_METHOD0(network_factory, const NetworkFactory& ());
+    const NetworkFactory& network_factory()
+    {
+        return network_factory_;
+    }
 
     MOCK_METHOD0(is_intraprocess_only, bool());
 
@@ -416,10 +419,12 @@ class RTPSParticipantImpl
 
     MockParticipantListener listener_;
 
-    ResourceEvent events_;
-
     RTPSParticipantAttributes attr_;
 
+    NetworkFactory network_factory_ {attr_};
+
+    ResourceEvent events_;
+
     std::map<GUID_t, Endpoint*> endpoints_;
 
     GUID_t generate_endpoint_guid() const
diff --git a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
index 61d6dbb8e8..a45f6435f3 100644
--- a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
+++ b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
@@ -41,7 +41,8 @@ namespace rtps {
 constexpr size_t max_unicast_locators = 4u;
 constexpr size_t max_multicast_locators = 1u;
 
-NetworkFactory network;
+RTPSParticipantAttributes participant_attributes;
+NetworkFactory network {participant_attributes};
 
 /*** Auxiliary functions ***/
 inline uint32_t string_cdr_serialized_size(
diff --git a/test/unittest/rtps/discovery/CMakeLists.txt b/test/unittest/rtps/discovery/CMakeLists.txt
index c0a814f300..4ff782ff10 100644
--- a/test/unittest/rtps/discovery/CMakeLists.txt
+++ b/test/unittest/rtps/discovery/CMakeLists.txt
@@ -52,6 +52,7 @@ target_compile_definitions(EdpTests PRIVATE
 target_include_directories(EdpTests PRIVATE
     ${PROJECT_SOURCE_DIR}/test/mock/rtps/PDP
     ${PROJECT_SOURCE_DIR}/test/mock/rtps/external_locators
+    ${PROJECT_SOURCE_DIR}/test/mock/rtps/NetworkFactory
     ${PROJECT_SOURCE_DIR}/test/mock/rtps/RTPSParticipantImpl
     ${PROJECT_SOURCE_DIR}/test/mock/rtps/Endpoint
     ${PROJECT_SOURCE_DIR}/test/mock/rtps/ReaderProxyData
diff --git a/test/unittest/rtps/discovery/EdpTests.cpp b/test/unittest/rtps/discovery/EdpTests.cpp
index b206d62ccf..04666516d1 100644
--- a/test/unittest/rtps/discovery/EdpTests.cpp
+++ b/test/unittest/rtps/discovery/EdpTests.cpp
@@ -20,7 +20,6 @@
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/participant/RTPSParticipantImpl.h>
 
 #if HAVE_SECURITY
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp
index ddd1483d6a..21ebf8d051 100644
--- a/test/unittest/rtps/security/SecurityTests.hpp
+++ b/test/unittest/rtps/security/SecurityTests.hpp
@@ -69,6 +69,20 @@ class MockParticipantCrypto
 
 typedef HandleImpl<MockParticipantCrypto, SecurityTest> MockParticipantCryptoHandle;
 
+struct SecurityTestsGlobalDefaultValues
+{
+    // Default Values
+    RTPSParticipantAttributes pattr;
+
+    SecurityTestsGlobalDefaultValues()
+    {
+        ::testing::DefaultValue<const RTPSParticipantAttributes&>::Set(pattr);
+    }
+
+};
+
+static SecurityTestsGlobalDefaultValues g_security_default_values_;
+
 class SecurityTest : public ::testing::Test
 {
 protected:
@@ -182,7 +196,7 @@ class SecurityTest : public ::testing::Test
     bool security_activated_;
 
     // Default Values
-    NetworkFactory network;
+    NetworkFactory network{g_security_default_values_.pattr};
     GUID_t guid;
     CDRMessage_t default_cdr_message;
 
@@ -218,18 +232,4 @@ class SecurityTest : public ::testing::Test
 
 };
 
-struct SecurityTestsGlobalDefaultValues
-{
-    // Default Values
-    RTPSParticipantAttributes pattr;
-
-    SecurityTestsGlobalDefaultValues()
-    {
-        ::testing::DefaultValue<const RTPSParticipantAttributes&>::Set(pattr);
-    }
-
-};
-
-static SecurityTestsGlobalDefaultValues g_security_default_values_;
-
 #endif // __TEST_UNITTEST_RTPS_SECURITY_SECURITYTESTS_HPP__