diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/AbstractVerification.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/AbstractVerification.java
index 2537c3342523..cc47d83190bb 100644
--- a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/AbstractVerification.java
+++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/AbstractVerification.java
@@ -214,20 +214,18 @@ public VerificationResult run()
             }
         }
 
-        return
-
-                concludeVerification(
-                        partialResult.get(),
-                        control,
-                        test,
-                        controlQueryContext,
-                        testQueryContext,
-                        matchResult,
-                        determinismAnalysis,
-                        controlChecksumQueryContext,
-                        testChecksumQueryContext,
-                        determinismAnalysisDetails.build(),
-                        throwable);
+        return concludeVerification(
+                partialResult.get(),
+                control,
+                test,
+                controlQueryContext,
+                testQueryContext,
+                matchResult,
+                determinismAnalysis,
+                controlChecksumQueryContext,
+                testChecksumQueryContext,
+                determinismAnalysisDetails.build(),
+                throwable);
     }
 
     private Optional<String> resolveFailure(
diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationManager.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationManager.java
index 000db551f654..32b797cffeaa 100644
--- a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationManager.java
+++ b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerificationManager.java
@@ -81,12 +81,12 @@ public class VerificationManager
     private final int maxConcurrency;
     private final int suiteRepetitions;
     private final int queryRepetitions;
-    private int verificationResubmissionLimit;
-    private boolean skipControl;
+    private final int verificationResubmissionLimit;
+    private final boolean skipControl;
 
-    private ExecutorService executor;
-    private CompletionService<VerificationResult> completionService;
-    private AtomicInteger queriesSubmitted = new AtomicInteger();
+    private final ExecutorService executor;
+    private final CompletionService<VerificationResult> completionService;
+    private final AtomicInteger queriesSubmitted = new AtomicInteger();
 
     @Inject
     public VerificationManager(
@@ -117,14 +117,14 @@ public VerificationManager(
         this.queryRepetitions = config.getQueryRepetitions();
         this.verificationResubmissionLimit = config.getVerificationResubmissionLimit();
         this.skipControl = config.isSkipControl();
+
+        this.executor = newFixedThreadPool(maxConcurrency);
+        this.completionService = new ExecutorCompletionService<>(executor);
     }
 
     @PostConstruct
     public void start()
     {
-        this.executor = newFixedThreadPool(maxConcurrency);
-        this.completionService = new ExecutorCompletionService<>(executor);
-
         List<SourceQuery> sourceQueries = sourceQuerySupplier.get();
         log.info("Total Queries: %s", sourceQueries.size());
         sourceQueries = applyOverrides(sourceQueries);