diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
index bde787ec1..9724af1d8 100644
--- a/client/common/CMakeLists.txt
+++ b/client/common/CMakeLists.txt
@@ -28,7 +28,6 @@ endif()
 set(${MODULE_PREFIX}_SRCS
 	client.c
 	cmdline.c
-	assistance.c
 	compatibility.c
 	compatibility.h
 	file.c)
@@ -73,4 +72,5 @@ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Common")
 if(BUILD_TESTING)
 	add_subdirectory(test)
 endif()
+
 export_complex_library(LIBNAME ${MODULE_NAME})
diff --git a/client/common/client.c b/client/common/client.c
index 13b46b6bf..b3b5ff391 100644
--- a/client/common/client.c
+++ b/client/common/client.c
@@ -24,10 +24,10 @@
 #include <freerdp/client.h>
 
 #include <freerdp/addin.h>
+#include <freerdp/assistance.h>
 #include <freerdp/client/file.h>
 #include <freerdp/client/cmdline.h>
 #include <freerdp/client/channels.h>
-#include <freerdp/client/assistance.h>
 
 int freerdp_client_common_new(freerdp* instance, rdpContext* context)
 {
diff --git a/client/common/test/CMakeLists.txt b/client/common/test/CMakeLists.txt
index bdb18ede5..b68ac11e7 100644
--- a/client/common/test/CMakeLists.txt
+++ b/client/common/test/CMakeLists.txt
@@ -6,8 +6,7 @@ set(${MODULE_PREFIX}_DRIVER ${MODULE_NAME}.c)
 
 set(${MODULE_PREFIX}_TESTS
 	TestClientRdpFile.c
-	TestClientChannels.c
-	TestClientAssistance.c)
+	TestClientChannels.c)
 
 create_test_sourcelist(${MODULE_PREFIX}_SRCS
 	${${MODULE_PREFIX}_DRIVER}
diff --git a/include/freerdp/client/assistance.h b/include/freerdp/assistance.h
similarity index 94%
rename from include/freerdp/client/assistance.h
rename to include/freerdp/assistance.h
index 6af76c668..00bd33a35 100644
--- a/include/freerdp/client/assistance.h
+++ b/include/freerdp/assistance.h
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#ifndef FREERDP_CLIENT_ASSISTANCE_H
-#define FREERDP_CLIENT_ASSISTANCE_H
+#ifndef FREERDP_REMOTE_ASSISTANCE_H
+#define FREERDP_REMOTE_ASSISTANCE_H
 
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
@@ -69,5 +69,5 @@ FREERDP_API void freerdp_client_assistance_file_free(rdpAssistanceFile* file);
 }
 #endif
 
-#endif /* FREERDP_CLIENT_ASSISTANCE_H */
+#endif /* FREERDP_REMOTE_ASSISTANCE_H */
 
diff --git a/libfreerdp/common/CMakeLists.txt b/libfreerdp/common/CMakeLists.txt
index 2a22526e6..bbdaa70bb 100644
--- a/libfreerdp/common/CMakeLists.txt
+++ b/libfreerdp/common/CMakeLists.txt
@@ -20,15 +20,22 @@ set(MODULE_PREFIX "FREERDP_COMMON")
 
 set(${MODULE_PREFIX}_SRCS
 	addin.c
-	settings.c)
+	settings.c
+	assistance.c)
 
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
 	SOURCES ${${MODULE_PREFIX}_SRCS}
 	EXPORT)
 
+include_directories(${OPENSSL_INCLUDE_DIR})
+include_directories(${ZLIB_INCLUDE_DIRS})
+	
 set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
 
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
+	${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
+
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS MONOLITHIC ${MONOLITHIC_BUILD}
 	MODULE winpr
 	MODULES winpr-crt winpr-path winpr-file winpr-library winpr-utils)
@@ -42,3 +49,6 @@ endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/libfreerdp")
 
+if(BUILD_TESTING)
+	add_subdirectory(test)
+endif()
diff --git a/client/common/assistance.c b/libfreerdp/common/assistance.c
similarity index 99%
rename from client/common/assistance.c
rename to libfreerdp/common/assistance.c
index eb57d614f..a9103a502 100644
--- a/client/common/assistance.c
+++ b/libfreerdp/common/assistance.c
@@ -37,7 +37,7 @@
 #include <freerdp/client/file.h>
 #include <freerdp/client/cmdline.h>
 
-#include <freerdp/client/assistance.h>
+#include <freerdp/assistance.h>
 
 /**
  * Password encryption in establishing a remote assistance session of type 1:
diff --git a/libfreerdp/common/test/.gitignore b/libfreerdp/common/test/.gitignore
new file mode 100644
index 000000000..fc0d9cf4c
--- /dev/null
+++ b/libfreerdp/common/test/.gitignore
@@ -0,0 +1,3 @@
+TestCommon
+TestCommon.c
+
diff --git a/libfreerdp/common/test/CMakeLists.txt b/libfreerdp/common/test/CMakeLists.txt
new file mode 100644
index 000000000..e8096b5df
--- /dev/null
+++ b/libfreerdp/common/test/CMakeLists.txt
@@ -0,0 +1,31 @@
+
+set(MODULE_NAME "TestCommon")
+set(MODULE_PREFIX "TEST_COMMON")
+
+set(${MODULE_PREFIX}_DRIVER ${MODULE_NAME}.c)
+
+set(${MODULE_PREFIX}_TESTS
+	TestCommonAssistance.c)
+
+create_test_sourcelist(${MODULE_PREFIX}_SRCS
+	${${MODULE_PREFIX}_DRIVER}
+	${${MODULE_PREFIX}_TESTS})
+
+add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
+
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+	MONOLITHIC ${MONOLITHIC_BUILD}
+	MODULE freerdp
+	MODULES freerdp-common)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+
+set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
+
+foreach(test ${${MODULE_PREFIX}_TESTS})
+	get_filename_component(TestName ${test} NAME_WE)
+	add_test(${TestName} ${TESTING_OUTPUT_DIRECTORY}/${MODULE_NAME} ${TestName})
+endforeach()
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/Common/Test")
+
diff --git a/client/common/test/TestClientAssistance.c b/libfreerdp/common/test/TestCommonAssistance.c
similarity index 98%
rename from client/common/test/TestClientAssistance.c
rename to libfreerdp/common/test/TestCommonAssistance.c
index ab645e8be..697d3e303 100644
--- a/client/common/test/TestClientAssistance.c
+++ b/libfreerdp/common/test/TestCommonAssistance.c
@@ -2,7 +2,7 @@
 #include <winpr/crt.h>
 #include <winpr/print.h>
 
-#include <freerdp/client/assistance.h>
+#include <freerdp/assistance.h>
 
 const char* TEST_MSRC_INCIDENT_PASSWORD_TYPE1 = "Password1";
 
@@ -160,7 +160,7 @@ int test_msrsc_incident_file_type2()
 	return 0;
 }
 
-int TestClientAssistance(int argc, char* argv[])
+int TestCommonAssistance(int argc, char* argv[])
 {
 	test_msrsc_incident_file_type1();