From b5633aa87c1c702d5d86c9e7e8d14eaaf9ba04b9 Mon Sep 17 00:00:00 2001
From: Jean Bredeche <jean@quantopian.com>
Date: Wed, 8 Jun 2016 14:16:17 -0400
Subject: [PATCH] DEV: Fix merge issues.

---
 tests/test_history.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_history.py b/tests/test_history.py
index 7d4d38f9..ad42be28 100644
--- a/tests/test_history.py
+++ b/tests/test_history.py
@@ -504,7 +504,7 @@ class MinuteEquityHistoryTestCase(WithHistory, ZiplineTestCase):
                 pd.Timestamp('2015-01-07', tz='UTC'),
                 start_val=1000),
             create_minute_df_for_asset(
-                cls.env,
+                cls.trading_schedule,
                 pd.Timestamp('2015-01-08', tz='UTC'),
                 pd.Timestamp('2015-01-08', tz='UTC'),
                 start_val=1000)
@@ -564,7 +564,7 @@ class MinuteEquityHistoryTestCase(WithHistory, ZiplineTestCase):
             # before any of the adjustments, 1/4 and 1/5
             window1 = self.data_portal.get_history_window(
                 [asset],
-                self.env.get_open_and_close(jan5)[1],
+                self.trading_schedule.start_and_end(jan5)[1],
                 2,
                 '1d',
                 'close'
@@ -625,7 +625,7 @@ class MinuteEquityHistoryTestCase(WithHistory, ZiplineTestCase):
         # before any of the dividends
         window1 = self.data_portal.get_history_window(
             [asset],
-            self.env.get_open_and_close(jan5)[1],
+            self.trading_schedule.start_and_end(jan5)[1],
             2,
             '1d',
             'close'