diff --git a/test/cpp/qps/smoke_test.cc b/test/cpp/qps/smoke_test.cc
index a6b5ef60a56af4e1d6dd26b49302cfa1d535278e..5cdabb88a0db06b57fe1f6adf8b264532d235e50 100644
--- a/test/cpp/qps/smoke_test.cc
+++ b/test/cpp/qps/smoke_test.cc
@@ -39,6 +39,9 @@
 namespace grpc {
 namespace testing {
 
+static const int WARMUP = 5;
+static const int BENCHMARK = 10;
+
 static void RunSynchronousUnaryPingPong() {
   gpr_log(GPR_INFO, "Running Synchronous Unary Ping Pong");
 
@@ -55,7 +58,7 @@ static void RunSynchronousUnaryPingPong() {
   server_config.set_enable_ssl(false);
   server_config.set_threads(1);
 
-  auto result = RunScenario(client_config, 1, server_config, 1, 30, 120);
+  auto result = RunScenario(client_config, 1, server_config, 1, WARMUP, BENCHMARK);
 
   gpr_log(GPR_INFO, "QPS: %.1f",
           result.latencies.Count() /
@@ -84,7 +87,7 @@ static void RunSynchronousStreamingPingPong() {
   server_config.set_enable_ssl(false);
   server_config.set_threads(1);
 
-  auto result = RunScenario(client_config, 1, server_config, 1, 30, 120);
+  auto result = RunScenario(client_config, 1, server_config, 1, WARMUP, BENCHMARK);
 
   gpr_log(GPR_INFO, "QPS: %.1f",
           result.latencies.Count() /
@@ -114,7 +117,7 @@ static void RunAsyncUnaryPingPong() {
   server_config.set_enable_ssl(false);
   server_config.set_threads(1);
 
-  auto result = RunScenario(client_config, 1, server_config, 1, 30, 120);
+  auto result = RunScenario(client_config, 1, server_config, 1, WARMUP, BENCHMARK);
 
   gpr_log(GPR_INFO, "QPS: %.1f",
           result.latencies.Count() /
@@ -144,7 +147,7 @@ static void RunQPS() {
   server_config.set_enable_ssl(false);
   server_config.set_threads(4);
 
-  auto result = RunScenario(client_config, 1, server_config, 1, 30, 120);
+  auto result = RunScenario(client_config, 1, server_config, 1, WARMUP, BENCHMARK);
 
   auto qps = 
       result.latencies.Count() /
diff --git a/test/cpp/qps/smoke_test.sh b/test/cpp/qps/smoke_test.sh
index 431a29705eca001833d52b84425edc127fdb5fc0..ba7f0a4f27dd427bf38a3d9fe9a022fdc550c20d 100755
--- a/test/cpp/qps/smoke_test.sh
+++ b/test/cpp/qps/smoke_test.sh
@@ -8,7 +8,7 @@ cd $(dirname $0)/../../..
 
 killall qps_worker || true
 
-config=dbg
+config=opt
 
 NUMCPUS=`python2.7 -c 'import multiprocessing; print multiprocessing.cpu_count()'`
 
diff --git a/third_party/openssl b/third_party/openssl
index 3df69d3aefde7671053d4e3c242b228e5d79c83f..4ac0329582829f5378d8078c8d314ad37db87736 160000
--- a/third_party/openssl
+++ b/third_party/openssl
@@ -1 +1 @@
-Subproject commit 3df69d3aefde7671053d4e3c242b228e5d79c83f
+Subproject commit 4ac0329582829f5378d8078c8d314ad37db87736