diff --git a/src/main/java/org/apache/sysds/runtime/instructions/fed/QuantilePickFEDInstruction.java b/src/main/java/org/apache/sysds/runtime/instructions/fed/QuantilePickFEDInstruction.java
index e70f1dffa63..c5753bcac9c 100644
--- a/src/main/java/org/apache/sysds/runtime/instructions/fed/QuantilePickFEDInstruction.java
+++ b/src/main/java/org/apache/sysds/runtime/instructions/fed/QuantilePickFEDInstruction.java
@@ -234,7 +234,7 @@ public <T> MatrixBlock getEquiHeightBins(ExecutionContext ec, int colID, double[
 	public <T> void processRowQPick(ExecutionContext ec) {
 		MatrixObject in = ec.getMatrixObject(input1);
 		FederationMap fedMap = in.getFedMapping();
-		boolean average = _type == OperationTypes.MEDIAN;
+		boolean average = _type == OperationTypes.MEDIAN || _type == OperationTypes.VALUEPICK;
 
 		double[] quantiles = input2 != null ? (input2.isMatrix() ? ec.getMatrixInput(input2).getDenseBlockValues() :
 			input2.isScalar() ? new double[] {ec.getScalarInput(input2).getDoubleValue()} : null) :
diff --git a/src/test/java/org/apache/sysds/test/functions/federated/primitives/part2/FederatedQuantileTest.java b/src/test/java/org/apache/sysds/test/functions/federated/primitives/part2/FederatedQuantileTest.java
index 6f13fce81b2..57ca28055a4 100644
--- a/src/test/java/org/apache/sysds/test/functions/federated/primitives/part2/FederatedQuantileTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/federated/primitives/part2/FederatedQuantileTest.java
@@ -30,7 +30,6 @@
 import org.apache.sysds.test.TestConfiguration;
 import org.apache.sysds.test.TestUtils;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -71,19 +70,16 @@ public void setUp() {
 	}
 
 	@Test
-	@Ignore
 	public void federatedQuantile1CP() {
 		federatedQuartile(Types.ExecMode.SINGLE_NODE, TEST_NAME1, 0.25);
 	}
 
 	@Test
-	@Ignore
 	public void federatedQuantile2CP() {
 		federatedQuartile(Types.ExecMode.SINGLE_NODE, TEST_NAME1, 0.5);
 	}
 
 	@Test
-	@Ignore
 	public void federatedQuantile3CP() {
 		federatedQuartile(Types.ExecMode.SINGLE_NODE, TEST_NAME1, 0.75);
 	}
@@ -104,19 +100,16 @@ public void federatedQuantilesCP() {
 	}
 
 	@Test
-	@Ignore
 	public void federatedQuantile1SP() {
 		federatedQuartile(Types.ExecMode.SPARK, TEST_NAME1, 0.25);
 	}
 
 	@Test
-	@Ignore
 	public void federatedQuantile2SP() {
 		federatedQuartile(Types.ExecMode.SPARK, TEST_NAME1, 0.5);
 	}
 
 	@Test
-	@Ignore
 	public void federatedQuantile3SP() {
 		federatedQuartile(Types.ExecMode.SPARK, TEST_NAME1, 0.75);
 	}