OpenNMS · cgorantla · Jan 5, 2026 · Dec 24, 2025
diff --git a/opennms-webapp-rest/pom.xml b/opennms-webapp-rest/pom.xml
@@ -337,6 +337,12 @@
       <artifactId>opennms-rrd-api</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms.features</groupId>
+      <artifactId>org.opennms.features.timeseries</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.features.collection</groupId>
       <artifactId>org.opennms.features.collection.persistence.osgi</artifactId>

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AcknowledgmentRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AcknowledgmentRestServiceIT.java
@@ -73,7 +73,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class AcknowledgmentRestServiceIT extends AbstractSpringJerseyRestTestCase {
 	@Autowired

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java
@@ -80,7 +80,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class AlarmRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmStatsRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmStatsRestServiceIT.java
@@ -83,7 +83,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 @Transactional
 public class AlarmStatsRestServiceIT extends AbstractSpringJerseyRestTestCase {

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetRecordResourceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetRecordResourceIT.java
@@ -61,7 +61,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 @Transactional
 public class AssetRecordResourceIT extends AbstractSpringJerseyRestTestCase {

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetSuggestionsRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetSuggestionsRestServiceIT.java
@@ -68,7 +68,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class AssetSuggestionsRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AvailabilityRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AvailabilityRestServiceIT.java
@@ -68,7 +68,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 @Transactional
 public class AvailabilityRestServiceIT extends AbstractSpringJerseyRestTestCase {

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/CategoryRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/CategoryRestServiceIT.java
@@ -68,7 +68,7 @@
         "classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class CategoryRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/EventRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/EventRestServiceIT.java
@@ -60,7 +60,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 @Transactional
 public class EventRestServiceIT extends AbstractSpringJerseyRestTestCase {

diff --git a/...s-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceConfigRestServiceIT.java b/...s-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceConfigRestServiceIT.java
@@ -58,7 +58,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class ForeignSourceConfigRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceRestServiceIT.java
@@ -54,7 +54,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class ForeignSourceRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GroupRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GroupRestServiceIT.java
@@ -74,7 +74,7 @@
         "classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class GroupRestServiceIT extends AbstractSpringJerseyRestTestCase {
     private static final Logger LOG = LoggerFactory.getLogger(GroupRestServiceIT.class);

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GzipEncodingRestIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GzipEncodingRestIT.java
@@ -72,7 +72,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class GzipEncodingRestIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/HardwareInventoryResourceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/HardwareInventoryResourceIT.java
@@ -62,7 +62,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class HardwareInventoryResourceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IPhoneRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IPhoneRestServiceIT.java
@@ -66,7 +66,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 @Transactional
 public class IPhoneRestServiceIT extends AbstractSpringJerseyRestTestCase {

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IfServicesRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IfServicesRestServiceIT.java
@@ -66,7 +66,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 @Transactional
 public class IfServicesRestServiceIT extends AbstractSpringJerseyRestTestCase {

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/InfoRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/InfoRestServiceIT.java
@@ -70,7 +70,7 @@
         "classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class InfoRestServiceIT extends AbstractSpringJerseyRestTestCase {
     private static final Logger LOG = LoggerFactory.getLogger(InfoRestServiceIT.class);

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/KscRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/KscRestServiceIT.java
@@ -68,7 +68,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class KscRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MinionRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MinionRestServiceIT.java
@@ -56,7 +56,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class MinionRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/...ms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MonitoringLocationRestServiceIT.java b/...ms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MonitoringLocationRestServiceIT.java
@@ -56,7 +56,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class MonitoringLocationRestServiceIT extends AbstractSpringJerseyRestTestCase {
     private static final Logger LOG = LoggerFactory.getLogger(org.opennms.web.rest.v2.MonitoringLocationRestServiceIT.class);

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NodeRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NodeRestServiceIT.java
@@ -97,7 +97,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class NodeRestServiceIT extends AbstractSpringJerseyRestTestCase {
     private static final Logger LOG = LoggerFactory.getLogger(NodeRestServiceIT.class);

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NotificationRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NotificationRestServiceIT.java
@@ -62,7 +62,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 @Transactional
 public class NotificationRestServiceIT extends AbstractSpringJerseyRestTestCase {

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/OutageRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/OutageRestServiceIT.java
@@ -76,7 +76,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class OutageRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/RequisitionRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/RequisitionRestServiceIT.java
@@ -61,7 +61,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class RequisitionRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ScheduledOutagesRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ScheduledOutagesRestServiceIT.java
@@ -83,7 +83,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class ScheduledOutagesRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/SnmpConfigRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/SnmpConfigRestServiceIT.java
@@ -66,7 +66,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
 		"classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class SnmpConfigRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/TimelineRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/TimelineRestServiceIT.java
@@ -55,7 +55,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class TimelineRestServiceIT extends AbstractSpringJerseyRestTestCase {
     private static final Logger LOG = LoggerFactory.getLogger(NodeRestServiceIT.class);

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/UserRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/UserRestServiceIT.java
@@ -76,7 +76,7 @@
         "classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class UserRestServiceIT extends AbstractSpringJerseyRestTestCase  {
     private static final String PASSWORD = "21232F297A57A5A743894A0E4A801FC3";

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/WebAssetsRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/WebAssetsRestServiceIT.java
@@ -54,7 +54,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class WebAssetsRestServiceIT extends AbstractSpringJerseyRestTestCase {
     protected void beforeServletStart() throws Exception {

diff --git a/...ebapp-rest/src/test/java/org/opennms/web/rest/v1/config/AgentConfigurationResourceIT.java b/...ebapp-rest/src/test/java/org/opennms/web/rest/v1/config/AgentConfigurationResourceIT.java
@@ -57,7 +57,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class AgentConfigurationResourceIT extends AbstractSpringJerseyRestTestCase {
     @SuppressWarnings("unused")

diff --git a/...app-rest/src/test/java/org/opennms/web/rest/v1/config/DataCollectionConfigResourceIT.java b/...app-rest/src/test/java/org/opennms/web/rest/v1/config/DataCollectionConfigResourceIT.java
@@ -57,7 +57,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class DataCollectionConfigResourceIT extends AbstractSpringJerseyRestTestCase {
     @SuppressWarnings("unused")

diff --git a/...-rest/src/test/java/org/opennms/web/rest/v1/config/JmxDataCollectionConfigResourceIT.java b/...-rest/src/test/java/org/opennms/web/rest/v1/config/JmxDataCollectionConfigResourceIT.java
@@ -56,7 +56,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class JmxDataCollectionConfigResourceIT extends AbstractSpringJerseyRestTestCase {
     @SuppressWarnings("unused")

diff --git a/...webapp-rest/src/test/java/org/opennms/web/rest/v1/config/SnmpConfigurationResourceIT.java b/...webapp-rest/src/test/java/org/opennms/web/rest/v1/config/SnmpConfigurationResourceIT.java
@@ -51,7 +51,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class SnmpConfigurationResourceIT extends AbstractSpringJerseyRestTestCase {
     @SuppressWarnings("unused")

diff --git a/...ebapp-rest/src/test/java/org/opennms/web/rest/v1/config/TrapdConfigurationResourceIT.java b/...ebapp-rest/src/test/java/org/opennms/web/rest/v1/config/TrapdConfigurationResourceIT.java
@@ -51,7 +51,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class TrapdConfigurationResourceIT extends AbstractSpringJerseyRestTestCase {
     @SuppressWarnings("unused")

diff --git a/...-webapp-rest/src/test/java/org/opennms/web/rest/v1/json/RequisitionRestServiceJsonIT.java b/...-webapp-rest/src/test/java/org/opennms/web/rest/v1/json/RequisitionRestServiceJsonIT.java
@@ -64,7 +64,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class RequisitionRestServiceJsonIT extends AbstractSpringJerseyRestJsonTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/AlarmRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/AlarmRestServiceIT.java
@@ -89,7 +89,10 @@
         "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml",
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml"
 })
-@JUnitConfigurationEnvironment(systemProperties="org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger")
+@JUnitConfigurationEnvironment(systemProperties={
+        "org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger",
+        "org.opennms.timeseries.strategy=integration"
+})
 @JUnitTemporaryDatabase
 @Transactional
 public class AlarmRestServiceIT extends AbstractSpringJerseyRestTestCase {

diff --git a/...nms-webapp-rest/src/test/java/org/opennms/web/rest/v2/ApplicationStatusRestServiceIT.java b/...nms-webapp-rest/src/test/java/org/opennms/web/rest/v2/ApplicationStatusRestServiceIT.java
@@ -65,7 +65,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml",
         "classpath:/applicationContext-rest-test.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class ApplicationStatusRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/DiscoveryRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/DiscoveryRestServiceIT.java
@@ -57,7 +57,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml",
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class DiscoveryRestServiceIT extends AbstractSpringJerseyRestTestCase {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfPersistenceServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfPersistenceServiceIT.java
@@ -69,7 +69,7 @@
         "classpath:/applicationContext-rest-test.xml"
 
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class EventConfPersistenceServiceIT {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfRestServiceIT.java
@@ -86,7 +86,7 @@
 
 })
 
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class EventConfRestServiceIT {
 

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventRestServiceIT.java
@@ -60,7 +60,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml",
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 @Transactional
 public class EventRestServiceIT extends AbstractSpringJerseyRestTestCase {

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IfServicesRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IfServicesRestServiceIT.java
@@ -66,7 +66,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml",
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class IfServicesRestServiceIT extends AbstractSpringJerseyRestTestCase {
     private static final Logger LOG = LoggerFactory.getLogger(IfServicesRestServiceIT.class);

diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IpInterfaceRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IpInterfaceRestServiceIT.java
@@ -51,7 +51,7 @@
         "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml",
         "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml"
 })
-@JUnitConfigurationEnvironment
+@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration")
 @JUnitTemporaryDatabase
 public class IpInterfaceRestServiceIT extends AbstractSpringJerseyRestTestCase {
     private static final Logger LOG = LoggerFactory.getLogger(IpInterfaceRestServiceIT.class);