diff --git a/Source/SGDLib/SGD.cpp b/Source/SGDLib/SGD.cpp
index 492a13dab..6050c9d63 100644
--- a/Source/SGDLib/SGD.cpp
+++ b/Source/SGDLib/SGD.cpp
@@ -2937,6 +2937,9 @@ SGDParams::SGDParams(const ConfigRecordType& configSGD, size_t sizeofElemType)
 
         if (configParallelTrain.Exists(L"DataParallelASGD"))
         {
+#ifndef ASGD_PARALLEL_SUPPORT
+            InvalidArgument("DataParallelASGD is not enabled in this version.\n");
+#else
             const ConfigRecordType & configDataParallelASGD(configParallelTrain(L"DataParallelASGD", ConfigRecordType::Record()));
             m_nFramesBetweenASGDSync = configDataParallelASGD(L"syncPeriod", ConfigRecordType::Array(intargvector(vector<int>{256})));
             m_isPipeline = configDataParallelASGD(L"UsePipeline", false);
@@ -2950,6 +2953,7 @@ SGDParams::SGDParams(const ConfigRecordType& configSGD, size_t sizeofElemType)
                 m_adjustPerMinibatches = configAdjustLearningRateAtBeginning(L"adjustPerMinibatches", (size_t)256);
             }
         }
+#endif
         } // if (!pMPI)
     } // if (configSGD.Exists(L"ParallelTrain"))
 }
diff --git a/Tests/EndToEndTests/ParallelTraining/AsynchronousSGD/testcases.yml b/Tests/EndToEndTests/ParallelTraining/AsynchronousSGD/testcases.yml
index 842a0d756..26e254d7b 100644
--- a/Tests/EndToEndTests/ParallelTraining/AsynchronousSGD/testcases.yml
+++ b/Tests/EndToEndTests/ParallelTraining/AsynchronousSGD/testcases.yml
@@ -2,10 +2,10 @@ dataDir: .
 #../../Data
 
 tags:
-     # running on every BVT job in 'P' (Parallel) leg in Debug-GPU and Release-CPU configurations:
-     - bvt-p  ((build_sku == 'gpu') or (build_sku == '1bitsgd')) and (flavor=='debug')
+     # running on every BVT job in 'P' (Parallel) leg in Debug-GPU on Linux configurations:
+     - bvt-p  ((build_sku == 'gpu') or (build_sku == '1bitsgd')) and (flavor=='debug') and (os == 'linux') 
      # running unconditionally on every Nightly job in 'P' leg
-     - nightly-p ((build_sku == 'gpu') or (build_sku == '1bitsgd'))
+     - nightly-p ((build_sku == 'gpu') or (build_sku == '1bitsgd')) and (os == 'linux') 
 
 testCases:
   Must train epochs in exactly same order and parameters for each MPI Rank: