diff --git a/eproperty/Property.hpp b/eproperty/Property.hpp
index 884df63..2f8bc5b 100644
--- a/eproperty/Property.hpp
+++ b/eproperty/Property.hpp
@@ -22,7 +22,7 @@ namespace eproperty {
 	 */
 	class Property {
 		public:
-			using Observer = std::function<void()>; //!< Local main object observer of changing value of the property
+			using Observer = etk::Function<void()>; //!< Local main object observer of changing value of the property
 		private:
 			eproperty::Interface* m_interfaceLink; //!< Base interface class to group all the property
 			Observer m_setObserver; //!< Observer of the changing value
diff --git a/lutin_eproperty-test.py b/lutin_eproperty-test.py
index c9ed5bf..b300a49 100644
--- a/lutin_eproperty-test.py
+++ b/lutin_eproperty-test.py
@@ -34,7 +34,7 @@ def configure(target, my_module):
 	    ])
 	my_module.add_depend([
 	    'eproperty',
-	    'gtest',
+	    'etest',
 	    'test-debug'
 	    ])
 	return True
diff --git a/test/main.cpp b/test/main.cpp
index 99a5770..2adbb87 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -10,7 +10,7 @@
 #include <etk/types.hpp>
 #include <etk/etk.hpp>
 #include <test-debug/debug.hpp>
-#include <gtest/gtest.h>
+#include <etest/etest.hpp>
 
 int main(int _argc, const char *_argv[]) {
 	::testing::InitGoogleTest(&_argc, const_cast<char **>(_argv));