diff --git a/build_and_test.sh b/build_and_test.sh
index ca8397e19..ee7377510 100755
--- a/build_and_test.sh
+++ b/build_and_test.sh
@@ -23,8 +23,13 @@ dotnet build
 
 echo "Testing solution"
 
-# Capturing test diagnostic logs because of hanging build
-# https://github.com/grpc/grpc-dotnet/pull/363
-dotnet test --no-build --diag:log.txt
+test_projects=( $( ls test/**/*Tests.csproj ) )
+
+for test_project in "${test_projects[@]}"
+do
+    # Capturing test diagnostic logs because of hanging build
+    # https://github.com/grpc/grpc-dotnet/pull/363
+    dotnet test $test_project --no-build --diag:artifacts/${test_project##*/}.log.txt
+done
 
 echo "Finished"
\ No newline at end of file