diff --git a/Jamfile b/Jamfile
index a2fa488d3..d2cd3142b 100755
--- a/Jamfile
+++ b/Jamfile
@@ -338,9 +338,12 @@ feature ipv6 : on off : composite propagated link-incompatible ;
 feature.compose <ipv6>off : <define>TORRENT_USE_IPV6=0 ;
 
 feature sanitize : off address undefined thread : composite propagated link-incompatible ;
+# sanitize is a clang and GCC feature
 feature.compose <sanitize>address : <cflags>-fsanitize=address <cflags>-fsanitize-undefined-trap-on-error <linkflags>-fsanitize=address ;
 feature.compose <sanitize>undefined : <cflags>-fsanitize=undefined <linkflags>-fsanitize=undefined ;
 feature.compose <sanitize>thread : <cflags>-fsanitize=thread <linkflags>-fsanitize=thread ;
+# RTC (runtime check) is an msvc feature
+feature.compose <sanitize>rtc : <cflags>/RTCc <cflags>/RTCsu ;
 
 feature need-librt : no yes : composite propagated link-incompatible ;
 
diff --git a/tools/run_tests.py b/tools/run_tests.py
index a1ed383e3..172075e54 100755
--- a/tools/run_tests.py
+++ b/tools/run_tests.py
@@ -158,7 +158,7 @@ def run_tests(toolset, tests, features, options, test_dir, time_limit):
 	return (toolset, results)
 
 def print_usage():
-		print '''usage: run_tests.py [options] bjam-toolset [bjam-toolset...]
+		print '''usage: run_tests.py [options] bjam-toolset [bjam-toolset...] [bjam-option...]
 options:
 -j<n>     use n parallel processes
 -h        prints this message and exits
@@ -193,6 +193,8 @@ def main(argv):
 				print 'unknown option: %s' % arg
 				print_usage()
 				sys.exit(1)
+		elif '=' in arg:
+			options.append(arg)
 		else:
 			toolsets.append(arg)