diff --git a/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/helper/MeasurementsHelperTest.java b/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/helper/MeasurementsHelperTest.java
index d48f0219eef7..688d9dc30f4a 100644
--- a/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/helper/MeasurementsHelperTest.java
+++ b/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/helper/MeasurementsHelperTest.java
@@ -12,7 +12,9 @@ public void verifyGetNodeOrNodeSourceDescriptor() {
         Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "", ""));
         Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", null, null));
         Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "opennms.local", ""));
-        Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "opennms.local", "201508240000"));
+        Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "", "201508240000"));
+        Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "opennms.local", null));
+        Assert.assertEquals("node[11]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", null, "201508240000"));
         Assert.assertEquals("nodeSource[opennms.local:20150824000000]", MeasurementsHelper.getNodeOrNodeSourceDescriptor("11", "opennms.local", "20150824000000"));
     }
 }
diff --git a/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/measurement/MeasurementQueryExecutorTest.java b/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/measurement/MeasurementQueryExecutorTest.java
index 90864c7f5053..97e87aaae4ac 100644
--- a/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/measurement/MeasurementQueryExecutorTest.java
+++ b/integrations/opennms-jasper-extensions/src/test/java/org/opennms/netmgt/jasper/measurement/MeasurementQueryExecutorTest.java
@@ -50,11 +50,11 @@ private interface ReportFiller {
         void fill(Map<String, Object> params) throws Exception;
     }
 
-    private List<Request> requestList = new ArrayList<Request>();
-
     @Rule
     public WireMockRule wireMockRule = new WireMockRule(9999);
 
+    private List<Request> requestList = new ArrayList<Request>();
+
     @Before
     public void before() throws IOException {
         requestList.clear();