diff --git a/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp b/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp
index 2d120e529b..dc05b708d9 100644
--- a/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp
+++ b/libs/sofia-sip/win32/tests/test_nua/test_nua.dsp
@@ -89,39 +89,39 @@ SOURCE="..\..\..\libsofia-sip-ua\su\memmem.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_100rel.c"
+SOURCE="..\..\..\tests\test_100rel.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_basic_call.c"
+SOURCE="..\..\..\tests\test_basic_call.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_call_hold.c"
+SOURCE="..\..\..\tests\test_call_hold.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_call_reject.c"
+SOURCE="..\..\..\tests\test_call_reject.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_cancel_bye.c"
+SOURCE="..\..\..\tests\test_cancel_bye.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_extension.c"
+SOURCE="..\..\..\tests\test_extension.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_init.c"
+SOURCE="..\..\..\tests\test_init.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nat.c"
+SOURCE="..\..\..\tests\test_nat.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nat.h"
+SOURCE="..\..\..\tests\test_nat.h"
 # End Source File
 # Begin Source File
 
@@ -129,55 +129,55 @@ SOURCE=.\test_nat_tags.cpp
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua.c"
+SOURCE="..\..\..\tests\test_nua.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua.h"
+SOURCE="..\..\..\tests\test_nua.h"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua_api.c"
+SOURCE="..\..\..\tests\test_nua_api.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_nua_params.c"
+SOURCE="..\..\..\tests\test_nua_params.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_offer_answer.c"
+SOURCE="..\..\..\tests\test_offer_answer.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_ops.c"
+SOURCE="..\..\..\tests\test_ops.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_proxy.c"
+SOURCE="..\..\..\tests\test_proxy.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_proxy.h"
+SOURCE="..\..\..\tests\test_proxy.h"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_refer.c"
+SOURCE="..\..\..\tests\test_refer.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_register.c"
+SOURCE="..\..\..\tests\test_register.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_session_timer.c"
+SOURCE="..\..\..\tests\test_session_timer.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_simple.c"
+SOURCE="..\..\..\tests\test_simple.c"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\..\libsofia-sip-ua\nua\test_sip_events.c"
+SOURCE="..\..\..\tests\test_sip_events.c"
 # End Source File
 # Begin Source File
 
diff --git a/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj b/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj
index 5610c326d0..cf8baa1aa9 100644
--- a/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj
+++ b/libs/sofia-sip/win32/tests/test_nua/test_nua.vcproj
@@ -234,7 +234,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_100rel.c"
+			RelativePath="..\..\..\tests\test_100rel.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -256,7 +256,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_basic_call.c"
+			RelativePath="..\..\..\tests\test_basic_call.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -278,7 +278,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_call_hold.c"
+			RelativePath="..\..\..\tests\test_call_hold.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -300,7 +300,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_call_reject.c"
+			RelativePath="..\..\..\tests\test_call_reject.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -322,7 +322,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_cancel_bye.c"
+			RelativePath="..\..\..\tests\test_cancel_bye.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -344,7 +344,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_extension.c"
+			RelativePath="..\..\..\tests\test_extension.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -366,7 +366,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_init.c"
+			RelativePath="..\..\..\tests\test_init.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -388,7 +388,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nat.c"
+			RelativePath="..\..\..\tests\test_nat.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -410,7 +410,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nat.h"
+			RelativePath="..\..\..\tests\test_nat.h"
 			>
 		</File>
 		<File
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua.c"
+			RelativePath="..\..\..\tests\test_nua.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -458,11 +458,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua.h"
+			RelativePath="..\..\..\tests\test_nua.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua_api.c"
+			RelativePath="..\..\..\tests\test_nua_api.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -484,7 +484,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_nua_params.c"
+			RelativePath="..\..\..\tests\test_nua_params.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -506,11 +506,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_offer_answer.c"
+			RelativePath="..\..\..\tests\test_offer_answer.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_ops.c"
+			RelativePath="..\..\..\tests\test_ops.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -532,7 +532,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_proxy.c"
+			RelativePath="..\..\..\tests\test_proxy.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -554,11 +554,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_proxy.h"
+			RelativePath="..\..\..\tests\test_proxy.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_refer.c"
+			RelativePath="..\..\..\tests\test_refer.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -580,7 +580,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_register.c"
+			RelativePath="..\..\..\tests\test_register.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -602,7 +602,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_session_timer.c"
+			RelativePath="..\..\..\tests\test_session_timer.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -624,7 +624,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_simple.c"
+			RelativePath="..\..\..\tests\test_simple.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -646,7 +646,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\libsofia-sip-ua\nua\test_sip_events.c"
+			RelativePath="..\..\..\tests\test_sip_events.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"