diff --git a/cluster/src/test/scala/io/snappydata/benchmark/snappy/tpch/DataValidationJob.scala b/cluster/src/test/scala/io/snappydata/benchmark/snappy/tpch/DataValidationJob.scala
index aef6c445c1..d9d682cd91 100644
--- a/cluster/src/test/scala/io/snappydata/benchmark/snappy/tpch/DataValidationJob.scala
+++ b/cluster/src/test/scala/io/snappydata/benchmark/snappy/tpch/DataValidationJob.scala
@@ -57,45 +57,30 @@ object DataValidationJob extends SnappySQLJob {
     for (query <- queries) {
       println(s"For Query $query")
 
-      if (!isDynamic) {
-        val expectedFile = sc.textFile(s"file://$expectedResultsAvailableAt/1_Spark_$query.out")
-
-        val actualFile = sc.textFile(s"file://$actualResultsAvailableAt/1_Snappy_$query.out")
-
-        val expectedLineSet = expectedFile.collect().toList.sorted
-        val actualLineSet = actualFile.collect().toList.sorted
-
-        if (!actualLineSet.equals(expectedLineSet)) {
-          if (!(expectedLineSet.size == actualLineSet.size)) {
-            resultOutputStream.println(s"For $query " +
-                s"result count mismatched observed with " +
-                s"expected ${expectedLineSet.size} and actual ${actualLineSet.size}")
-          } else {
-            for ((expectedLine, actualLine) <- expectedLineSet zip actualLineSet) {
-              if (!expectedLine.equals(actualLine)) {
-                resultOutputStream.println(s"For $query result mismatched observed")
-                resultOutputStream.println(s"Expected  : $expectedLine")
-                resultOutputStream.println(s"Found     : $actualLine")
-                resultOutputStream.println(s"-------------------------------------")
-              }
+      val expectedFile = sc.textFile(s"file://$expectedResultsAvailableAt/1_Spark_${query}_Results.out")
+
+      val actualFile = sc.textFile(s"file://$actualResultsAvailableAt/1_Snappy_${query}_Results.out")
+
+      val expectedLineSet = expectedFile.collect().toList.sorted
+      val actualLineSet = actualFile.collect().toList.sorted
+
+      if (!actualLineSet.equals(expectedLineSet)) {
+        if (!(expectedLineSet.size == actualLineSet.size)) {
+          resultOutputStream.println(s"For $query " +
+              s"result count mismatched observed with " +
+              s"expected ${expectedLineSet.size} and actual ${actualLineSet.size}")
+        } else {
+          for ((expectedLine, actualLine) <- expectedLineSet zip actualLineSet) {
+            if (!expectedLine.equals(actualLine)) {
+              resultOutputStream.println(s"For $query result mismatched observed")
+              resultOutputStream.println(s"Expected  : $expectedLine")
+              resultOutputStream.println(s"Found     : $actualLine")
+              resultOutputStream.println(s"-------------------------------------")
             }
           }
         }
-      } else {
-        val firstRunFileName = s"Snappy_${query}_FirstRun.out"
-        val firstRunFile = sc.textFile(firstRunFileName)
-
-        val secondRunFileName = s"Snappy_${query}_SecondRun.out"
-        val secondRunFile = sc.textFile(secondRunFileName)
-
-        val expectedLineSet = firstRunFile.collect().toList.sorted
-        val actualLineSet = secondRunFile.collect().toList.sorted
-
-        if (actualLineSet.equals(expectedLineSet)) {
-          resultOutputStream.println(s"For $query result matched observed")
-          resultOutputStream.println(s"-------------------------------------")
-        }
       }
+
     }
     // scalastyle:on
     resultOutputStream.close()