diff --git a/build.cmd b/build.cmd
index e21dc5ec..dc39b379 100644
--- a/build.cmd
+++ b/build.cmd
@@ -349,9 +349,13 @@ if "%InstallPythonPackages%" == "True" (
     echo "Installing python packages ... "
     echo "#################################"
     call "%PythonExe%" -m pip install --upgrade nose pytest graphviz imageio pytest-cov "jupyter_client>=4.4.0" "nbconvert>=4.2.0"
-    if %PythonVersion% == 2.7 ( call "%PythonExe%" -m pip install --upgrade pyzmq )
-    :: Run azureml-dataprep tests only in pyhon 3.7 as its an optional dependency
-    if %PythonVersion% == 3.7 ( call "%PythonExe%" -m pip install --upgrade "azureml-dataprep>=1.1.12" )
+
+    if %PythonVersion% == 2.7 (
+        call "%PythonExe%" -m pip install --upgrade pyzmq
+    ) else (
+        call "%PythonExe%" -m pip install --upgrade "azureml-dataprep>=1.1.12" 
+    )
+
     call "%PythonExe%" -m pip install --upgrade "%__currentScriptDir%target\%WheelFile%"
     call "%PythonExe%" -m pip install "scikit-learn==0.19.2"
 )
diff --git a/build.sh b/build.sh
index 9846dc6e..fc64415b 100755
--- a/build.sh
+++ b/build.sh
@@ -279,13 +279,14 @@ then
     if [ ${PythonVersion} = 2.7 ]
     then
         "${PythonExe}" -m pip install --upgrade pyzmq
-    elif [ ${PythonVersion} = 3.6 ] && [ "$(uname -s)" = "Darwin" ]
-    then
-        "${PythonExe}" -m pip install --upgrade pytest-remotedata
-    elif [ ${PythonVersion} = 3.7 ]
-    then
+    else
+        if [ ${PythonVersion} = 3.6 ] && [ "$(uname -s)" = "Darwin" ]
+        then
+            "${PythonExe}" -m pip install --upgrade pytest-remotedata
+        fi
+
         "${PythonExe}" -m pip install --upgrade "azureml-dataprep>=1.1.12"
-	fi
+    fi
     "${PythonExe}" -m pip install --upgrade "${Wheel}"
     "${PythonExe}" -m pip install "scikit-learn==0.19.2"
 fi
diff --git a/src/python/nimbusml/tests/dprep/test_dprep.py b/src/python/nimbusml/tests/dprep/test_dprep.py
index c8ebbbdb..a2061c51 100644
--- a/src/python/nimbusml/tests/dprep/test_dprep.py
+++ b/src/python/nimbusml/tests/dprep/test_dprep.py
@@ -28,7 +28,7 @@ def assert_2d_array_equal(actual, desired):
                 continue
             assert_true(actual[i][y] == desired[i][y])
 
-@unittest.skipIf(os.name == "posix" or sys.version_info[:2] != (3, 7), "azureml-dataprep is not installed.")
+@unittest.skipIf(sys.version_info[:2] == (2, 7), "azureml-dataprep is not installed.")
 class TestDprep(unittest.TestCase):
 
     def test_fit_transform(self):