diff --git a/doc/source/release.rst b/doc/source/release.rst
index 5b51100c28c71..9bfc3609f5b6d 100644
--- a/doc/source/release.rst
+++ b/doc/source/release.rst
@@ -457,6 +457,7 @@ Bug Fixes
 - Bug causing UnicodeEncodeError when get_dummies called with unicode values and a prefix (:issue:`6885`)
 - Bug in timeseries-with-frequency plot cursor display (:issue:`5453`)
 - Bug surfaced in groupby.plot when using a ``Float64Index`` (:issue:`7025`)
+- Stopped tests from failing if options data isn't able to be downloaded from Yahoo (:issue:`7034`)
 
 pandas 0.13.1
 -------------
diff --git a/pandas/io/tests/test_data.py b/pandas/io/tests/test_data.py
index a7d92d41eec15..8f98806d1ad59 100644
--- a/pandas/io/tests/test_data.py
+++ b/pandas/io/tests/test_data.py
@@ -9,7 +9,7 @@
 import pandas as pd
 from pandas import DataFrame
 from pandas.io import data as web
-from pandas.io.data import DataReader, SymbolWarning
+from pandas.io.data import DataReader, SymbolWarning, RemoteDataError
 from pandas.util.testing import (assert_series_equal, assert_produces_warning,
                                  network, assert_frame_equal)
 import pandas.util.testing as tm
@@ -252,8 +252,8 @@ def tearDownClass(cls):
     def test_get_options_data(self):
         try:
             calls, puts = self.aapl.get_options_data(expiry=self.expiry)
-        except IndexError:
-            warnings.warn("IndexError thrown no tables found")
+        except RemoteDataError as e:
+            nose.SkipTest(e)
         else:
             assert len(calls)>1
             assert len(puts)>1
@@ -269,8 +269,8 @@ def test_get_near_stock_price(self):
         try:
             calls, puts = self.aapl.get_near_stock_price(call=True, put=True,
                                                         expiry=self.expiry)
-        except IndexError:
-            warnings.warn("IndexError thrown no tables found")
+        except RemoteDataError as e:
+            nose.SkipTest(e)
         else:
             self.assertEqual(len(calls), 5)
             self.assertEqual(len(puts), 5)
@@ -279,8 +279,8 @@ def test_get_near_stock_price(self):
     def test_get_call_data(self):
         try:
             calls = self.aapl.get_call_data(expiry=self.expiry)
-        except IndexError:
-            warnings.warn("IndexError thrown no tables found")
+        except RemoteDataError as e:
+            nose.SkipTest(e)
         else:
             assert len(calls)>1
 
@@ -288,8 +288,8 @@ def test_get_call_data(self):
     def test_get_put_data(self):
         try:
             puts = self.aapl.get_put_data(expiry=self.expiry)
-        except IndexError:
-            warnings.warn("IndexError thrown no tables found")
+        except RemoteDataError as e:
+            nose.SkipTest(e)
         else:
             assert len(puts)>1
 
@@ -321,8 +321,8 @@ def test_get_options_data_warning(self):
             print('month: {0}, year: {1}'.format(self.month, self.year))
             try:
                 self.aapl.get_options_data(month=self.month, year=self.year)
-            except IndexError:
-                warnings.warn("IndexError thrown no tables found")
+            except RemoteDataError as e:
+                nose.SkipTest(e)
 
     @network
     def test_get_near_stock_price_warning(self):
@@ -333,8 +333,8 @@ def test_get_near_stock_price_warning(self):
                                                                     put=True,
                                                                     month=self.month,
                                                                     year=self.year)
-            except IndexError:
-                warnings.warn("IndexError thrown no tables found")
+            except RemoteDataError as e:
+                nose.SkipTest(e)
 
     @network
     def test_get_call_data_warning(self):
@@ -342,8 +342,8 @@ def test_get_call_data_warning(self):
             print('month: {0}, year: {1}'.format(self.month, self.year))
             try:
                 self.aapl.get_call_data(month=self.month, year=self.year)
-            except IndexError:
-                warnings.warn("IndexError thrown no tables found")
+            except RemoteDataError as e:
+                nose.SkipTest(e)
 
     @network
     def test_get_put_data_warning(self):
@@ -351,8 +351,8 @@ def test_get_put_data_warning(self):
             print('month: {0}, year: {1}'.format(self.month, self.year))
             try:
                 self.aapl.get_put_data(month=self.month, year=self.year)
-            except IndexError:
-                warnings.warn("IndexError thrown no tables found")
+            except RemoteDataError as e:
+                nose.SkipTest(e)
 
 
 class TestDataReader(tm.TestCase):