diff --git a/tests/test_historical.py b/tests/test_historical.py
index a8988aa5b2efebf9da805ea0e9ebd84b543a0428..6ea9463befad285ea982fe3d60a38f34845d5ebd 100644
--- a/tests/test_historical.py
+++ b/tests/test_historical.py
@@ -1,6 +1,7 @@
 import argparse
 import decimal
 import io
+import itertools
 import json
 import re
 
@@ -11,11 +12,11 @@ from . import any_date, relpath
 import oxrlib.commands.historical as oxrhist
 
 class FakeResponder:
-    def __init__(self, response_path):
-        self.response_path = response_path
+    def __init__(self, *response_paths):
+        self.paths = itertools.cycle(response_paths)
 
     def _respond(self, *args, **kwargs):
-        return open(self.response_path)
+        return next(self.paths).open()
 
     def __getattr__(self, name):
         return self._respond
@@ -38,9 +39,16 @@ class FakeConfig:
 
 output = pytest.fixture(lambda: io.StringIO())
 
+@pytest.fixture(scope='module')
+def single_responder():
+    return FakeResponder(relpath('historical1.json'))
+
 @pytest.fixture
-def historical1_responder():
-    return FakeResponder(relpath('historical1.json').as_posix())
+def alternate_responder():
+    return FakeResponder(
+        relpath('historical1.json'),
+        relpath('historical2.json'),
+    )
 
 def build_config(
         responder,
@@ -48,6 +56,7 @@ def build_config(
         amount=None,
         from_currency=None,
         to_currency=None,
+        from_date=None,
         ledger=False,
         signed_currencies=None,
         denomination=None,
@@ -59,6 +68,7 @@ def build_config(
         'amount': None if amount is None else decimal.Decimal(amount),
         'from_currency': from_currency,
         'to_currency': base if to_currency is None else to_currency,
+        'from_date': from_date,
         'output_format': oxrhist.Formats['LEDGER' if ledger else 'RAW'],
         'signed_currencies': [base] if signed_currencies is None else signed_currencies,
         'denomination': denomination,
@@ -86,8 +96,8 @@ def check_fx_amount(config, lines, amount, cost, fx_code, fx_sign=None, price=No
     line = next(lines, "<EOF>")
     assert re.match(pattern, line)
 
-def test_rate_list(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date)
+def test_rate_list(single_responder, output, any_date):
+    config = build_config(single_responder, any_date)
     lines = lines_from_run(config, output)
     assert next(lines).startswith('1 AED = 0.27229')
     assert next(lines) == '1 USD = 3.67246 AED\n'
@@ -96,52 +106,52 @@ def test_rate_list(historical1_responder, output, any_date):
     assert next(lines).startswith('1 ANG = 0.55865')
     assert next(lines) == '1 USD = 1.79 ANG\n'
 
-def test_one_rate(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date, from_currency='ANG')
+def test_one_rate(single_responder, output, any_date):
+    config = build_config(single_responder, any_date, from_currency='ANG')
     lines = lines_from_run(config, output)
     assert next(lines).startswith('1 ANG = 0.55865')
     assert next(lines) == '1 USD = 1.79 ANG\n'
     assert next(lines, None) is None
 
-def test_conversion(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date, amount=10, from_currency='AED')
+def test_conversion(single_responder, output, any_date):
+    config = build_config(single_responder, any_date, amount=10, from_currency='AED')
     lines = lines_from_run(config, output)
     assert next(lines) == '10.00 AED = 2.72 USD\n'
     assert next(lines, None) is None
 
-def test_back_conversion(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date,
+def test_back_conversion(single_responder, output, any_date):
+    config = build_config(single_responder, any_date,
                           amount=2, from_currency='USD', to_currency='ALL')
     lines = lines_from_run(config, output)
     assert next(lines) == '2.00 USD = 289 ALL\n'
     assert next(lines, None) is None
 
-def test_ledger_rate(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date,
+def test_ledger_rate(single_responder, output, any_date):
+    config = build_config(single_responder, any_date,
                           from_currency='ANG', ledger=True)
     lines = lines_from_run(config, output)
     check_fx_amount(config, lines, '1 ANG', '0.5586', 'USD', '$')
     check_fx_amount(config, lines, '1 USD', '1.79', 'ANG')
     assert next(lines, None) is None
 
-def test_ledger_conversion(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date,
+def test_ledger_conversion(single_responder, output, any_date):
+    config = build_config(single_responder, any_date,
                           from_currency='ALL', amount=300, ledger=True)
     lines = lines_from_run(config, output)
     check_fx_amount(config, lines, '300 ALL', '0.00691', 'USD', '$')
     assert next(lines) == '$2.08\n'
     assert next(lines, None) is None
 
-def test_signed_currencies(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date,
+def test_signed_currencies(single_responder, output, any_date):
+    config = build_config(single_responder, any_date,
                           from_currency='AED', ledger=True, signed_currencies=['EUR'])
     lines = lines_from_run(config, output)
     check_fx_amount(config, lines, '1 AED', '0.272', 'USD', '$')
     check_fx_amount(config, lines, '1 USD', '3.672', 'AED')
     assert next(lines, None) is None
 
-def test_denomination(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date,
+def test_denomination(single_responder, output, any_date):
+    config = build_config(single_responder, any_date,
                           from_currency='ANG', to_currency='AED', amount=10,
                           ledger=True, denomination='USD')
     lines = lines_from_run(config, output)
@@ -149,8 +159,8 @@ def test_denomination(historical1_responder, output, any_date):
     check_fx_amount(config, lines, '20.52 AED', '0.272', 'USD', '$')
     assert next(lines, None) is None
 
-def test_redundant_denomination(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date,
+def test_redundant_denomination(single_responder, output, any_date):
+    config = build_config(single_responder, any_date,
                           from_currency='ANG', to_currency='USD', amount=10,
                           ledger=True, denomination='USD')
     lines = lines_from_run(config, output)
@@ -158,8 +168,8 @@ def test_redundant_denomination(historical1_responder, output, any_date):
     assert next(lines) == '$5.59\n'
     assert next(lines, None) is None
 
-def test_from_denomination(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date,
+def test_from_denomination(single_responder, output, any_date):
+    config = build_config(single_responder, any_date,
                           from_currency='USD', to_currency='ALL', amount=10,
                           ledger=True, denomination='USD')
     lines = lines_from_run(config, output)
@@ -167,8 +177,8 @@ def test_from_denomination(historical1_responder, output, any_date):
     check_fx_amount(config, lines, '1,445 ALL', '0.00691', 'USD', '$')
     assert next(lines, None) is None
 
-def test_rate_precision_added_as_needed(historical1_responder, output, any_date):
-    config = build_config(historical1_responder, any_date,
+def test_rate_precision_added_as_needed(single_responder, output, any_date):
+    config = build_config(single_responder, any_date,
                           from_currency='RUB', to_currency='USD', amount=63805,
                           ledger=True, denomination='USD')
     lines = lines_from_run(config, output)
@@ -179,3 +189,21 @@ def test_rate_precision_added_as_needed(historical1_responder, output, any_date)
     check_fx_amount(config, lines, '63,805.00 RUB', '0.0175204', 'USD', '$')
     assert next(lines) == '$1,117.89\n'
     assert next(lines, None) is None
+
+def test_from_date_rates(alternate_responder, output, any_date):
+    config = build_config(alternate_responder, any_date,
+                          from_currency='ANG', to_currency='AED',
+                          from_date=any_date, ledger=True, denomination='USD')
+    lines = lines_from_run(config, output)
+    check_fx_amount(config, lines, '1 ANG', '2.051', 'AED', None, '1.909')
+    check_fx_amount(config, lines, '1 AED', '0.487', 'ANG', None, '0.523')
+    assert next(lines, None) is None
+
+def test_from_date_conversion(alternate_responder, output, any_date):
+    config = build_config(alternate_responder, any_date,
+                          from_currency='ANG', to_currency='AED', amount=10,
+                          from_date=any_date, ledger=True, denomination='USD')
+    lines = lines_from_run(config, output)
+    check_fx_amount(config, lines, '10.00 ANG', '0.558', 'USD', '$', '0.507')
+    check_fx_amount(config, lines, '20.52 AED', '0.272', 'USD', '$', '0.265')
+    assert next(lines, None) is None