diff --git a/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/entity-types.feature b/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/entity-types.feature
index 6caf065bf..534e71bb3 100644
--- a/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/entity-types.feature
+++ b/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/entity-types.feature
@@ -7,6 +7,7 @@ Feature: Entity types
     * def itemEntityTypeId = '0cb79a4c-f7eb-4941-a104-745224ae0292'
     * def loanEntityTypeId = '4e09d89a-44ed-418e-a9cc-820dfb27bf3a'
     * def userEntityTypeId = '0069cf6f-2833-46db-8a51-8934769b8289'
+    * def purchaseOrderLinesEntityTypeId = '90403847-8c47-4f58-b117-9a807b052808'
 
   Scenario: Get all entity types (no ids provided)
     Given path 'entity-types'
diff --git a/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/query.feature b/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/query.feature
index d1858dbd4..86461df34 100644
--- a/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/query.feature
+++ b/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/query.feature
@@ -6,6 +6,7 @@ Feature: Query
     * def itemEntityTypeId = '0cb79a4c-f7eb-4941-a104-745224ae0292'
     * def loanEntityTypeId = '4e09d89a-44ed-418e-a9cc-820dfb27bf3a'
     * def userEntityTypeId = '0069cf6f-2833-46db-8a51-8934769b8289'
+    * def purchaseOrderLinesEntityTypeId = '90403847-8c47-4f58-b117-9a807b052808'
 
   Scenario: Post query
     Given path 'query'
@@ -245,6 +246,19 @@ Feature: Query
     * def totalRecords = parseInt(response.totalRecords)
     * assert totalRecords > 0
 
+#  Scenario: Run a query on the purchase order lines entity type
+#    * def queryRequest = { entityTypeId: '#(purchaseOrderLinesEntityTypeId)' , fqlQuery: '{\"$and\":[{\"purchase_order_line_payment_status\":{\"$eq\":\"Fully paid\"}}]}' }
+#    * def queryCall = call postQuery
+#    * def queryId = queryCall.queryId
+#
+#    Given path 'query/' + queryId
+#    And params {includeResults: true, limit: 100, offset:0}
+#    When method GET
+#    Then status 200
+#    And match $.content contains deep {purchase_order_line_payment_status: 'Fully paid'}
+#    * def totalRecords = parseInt(response.totalRecords)
+#    * assert totalRecords > 0
+
   Scenario: Run a query on the loans entity type
     * def queryRequest = { entityTypeId: '#(itemEntityTypeId)' , fqlQuery: '{\"$and\":[{\"item_material_type\":{\"$in\":[\"book\", \"movie\"]}}]}' }
     * def queryCall = call postQuery
diff --git a/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/util/add-query-data.feature b/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/util/add-query-data.feature
index c8f3bd4b0..6829f9890 100644
--- a/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/util/add-query-data.feature
+++ b/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/features/util/add-query-data.feature
@@ -123,4 +123,18 @@ Feature: Add FQM query data
     When method POST
     Then status 201
 
+    # Add purchase order
+    * def orderId = call uuid1
+    * def orderRequest = {id: '#(orderId)', metadata: {createdDate: '2018-08-19T00:00:00.000+0000'}}
+    Given path '/orders-storage/purchase-orders'
+    And request orderRequest
+    When method POST
+    Then status 201
 
+    #Add Purchase Order Line
+    * def purchaseOrderLineId = call uuid1
+    * def purchaseOrderLineRequest = {id: '#(purchaseOrderLineId)', orderFormat:'P/E Mix' ,source:'User', purchaseOrderId:'#(orderId)', titleOrPackage: 'Kayak Fishing in the Northern Gulf Coast', paymentStatus: 'Fully Paid'}
+    Given path '/orders-storage/po-lines'
+    And request purchaseOrderLineRequest
+    When method POST
+    Then status 201
\ No newline at end of file
diff --git a/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/fqm-junit.feature b/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/fqm-junit.feature
index 41928e6ec..e690aa083 100644
--- a/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/fqm-junit.feature
+++ b/mod-fqm-manager/src/main/resources/corsair/mod-fqm-manager/fqm-junit.feature
@@ -10,6 +10,9 @@ Feature: mod-fqm-manager integration tests
       | 'mod-inventory-storage'             |
       | 'mod-circulation-storage'           |
       | 'mod-fqm-manager'                   |
+      | 'mod-finance-storage'               |
+      | 'mod-orders-storage'                |
+
 
     * table userPermissions
       | name                                                      |
@@ -30,6 +33,8 @@ Feature: mod-fqm-manager integration tests
       | 'fqm.query.all'                                           |
       | 'fqm.query.purge'                                         |
       | 'fqm.materializedViews.post'                              |
+      | 'orders-storage.purchase-orders.item.post'                |
+      | 'orders-storage.po-lines.item.post'                       |
 
   Scenario: create tenant and users for testing
     Given call read('classpath:common/setup-users.feature')