diff --git a/src/CalculatorWADTests/CalculatorSession.cs b/src/CalculatorWADTests/CalculatorSession.cs
index de297391..59c0257d 100644
--- a/src/CalculatorWADTests/CalculatorSession.cs
+++ b/src/CalculatorWADTests/CalculatorSession.cs
@@ -40,10 +40,10 @@ namespace CalculatorTest
                 appCapabilities.SetCapability("app", CalculatorAppId);
                 appCapabilities.SetCapability("deviceName", "WindowsPC");
                 session = new WindowsDriver<WindowsElement>(new Uri(WindowsApplicationDriverUrl), appCapabilities);
-                Thread.Sleep(150000);
+                Thread.Sleep(120000);
                 Assert.IsNotNull(session);
                 // Set implicit timeout to 5 seconds to make element search to retry every 500 ms for at most three times
-                session.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
+                session.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(1.5);
             }
         }
 
diff --git a/src/CalculatorWADTests/CalculatorTest.csproj b/src/CalculatorWADTests/CalculatorTest.csproj
index c1e149b2..0405c801 100644
--- a/src/CalculatorWADTests/CalculatorTest.csproj
+++ b/src/CalculatorWADTests/CalculatorTest.csproj
@@ -57,8 +57,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Drawing" />
-    <Reference Include="WebDriver, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll</HintPath>
+    <Reference Include="WebDriver, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Selenium.WebDriver.3.8.0\lib\net45\WebDriver.dll</HintPath>
     </Reference>
     <Reference Include="WebDriver.Support, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Selenium.Support.3.8.0\lib\net45\WebDriver.Support.dll</HintPath>
diff --git a/src/CalculatorWADTests/packages.config b/src/CalculatorWADTests/packages.config
index 92723ea8..34d7a6f2 100644
--- a/src/CalculatorWADTests/packages.config
+++ b/src/CalculatorWADTests/packages.config
@@ -6,5 +6,5 @@
   <package id="MSTest.TestFramework" version="2.0.0-beta2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
   <package id="Selenium.Support" version="3.8.0" targetFramework="net45" />
-  <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net45" />
+  <package id="Selenium.WebDriver" version="3.8.0" targetFramework="net45" />
 </packages>
\ No newline at end of file