diff --git a/libretroshare/src/pqi/pqissllistener.cc b/libretroshare/src/pqi/pqissllistener.cc
index 144f58599..b907197fc 100644
--- a/libretroshare/src/pqi/pqissllistener.cc
+++ b/libretroshare/src/pqi/pqissllistener.cc
@@ -180,7 +180,14 @@ int	pqissllistenbase::setuplisten()
 
     	{
       		int on = 1;
+
+/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
+#ifndef WINDOWS_SYS // ie UNIX
       		if (setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
+#else //WINDOWS_SYS 
+      		if (setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, (const char *) &on, sizeof(on)) < 0)
+#endif 
+/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
         	{
 			std::ostringstream out;
 			out << "pqissllistenbase::setuplisten()";
diff --git a/libretroshare/src/tests/netsetup_test.cc b/libretroshare/src/tests/netsetup_test.cc
index decfebd73..4c096ba74 100644
--- a/libretroshare/src/tests/netsetup_test.cc
+++ b/libretroshare/src/tests/netsetup_test.cc
@@ -198,6 +198,28 @@ int main(int argc, char **argv)
 	}
 
 
+#ifndef WINDOWS_SYS
+/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
+#else
+        // Windows Networking Init.
+        WORD wVerReq = MAKEWORD(2,2);
+        WSADATA wsaData;
+
+        if (0 != WSAStartup(wVerReq, &wsaData))
+        {
+                std::cerr << "Failed to Startup Windows Networking";
+                std::cerr << std::endl;
+        }
+        else
+        {
+                std::cerr << "Started Windows Networking";
+                std::cerr << std::endl;
+        }
+
+#endif
+/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
+
+
 	std::string ownId = "OWNID";
 
 	/* create a dummy auth mgr */
@@ -241,8 +263,14 @@ int main(int argc, char **argv)
 		connMgr->tick();
 
 		setupTest(i, connMgr);
-
+/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
+#ifndef WINDOWS_SYS // ie UNIX
 		sleep(1);
+#else
+		Sleep(1000);
+#endif
+/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
+
 		connMgr->tick();
 
 		checkResults(i, connMgr);