diff --git a/catalyst/exchange/exchange.py b/catalyst/exchange/exchange.py
index 9d1afe45..ef06c438 100644
--- a/catalyst/exchange/exchange.py
+++ b/catalyst/exchange/exchange.py
@@ -141,12 +141,16 @@ class Exchange:
 
         return symbols
 
-    def get_assets(self, symbols):
+    def get_assets(self, symbols=None):
         assets = []
 
-        for symbol in symbols:
-            asset = self.get_asset(symbol)
-            assets.append(asset)
+        if symbols is not None:
+            for symbol in symbols:
+                asset = self.get_asset(symbol)
+                assets.append(asset)
+        else:
+            for key in self.assets:
+                assets.append(self.assets[key])
 
         return assets
 
diff --git a/catalyst/exchange/exchange_bundle.py b/catalyst/exchange/exchange_bundle.py
index 668b3e57..d608d202 100644
--- a/catalyst/exchange/exchange_bundle.py
+++ b/catalyst/exchange/exchange_bundle.py
@@ -39,8 +39,14 @@ class ExchangeBundle:
         self._reader = None
 
     def get_assets(self, include_symbols, exclude_symbols):
-        # TODO: filter assets
-        return self.exchange.assets
+        # TODO: filter exclude symbols assets
+        if include_symbols is not None:
+            include_symbols_list = include_symbols.split(',')
+
+            return self.exchange.get_assets(include_symbols_list)
+
+        else:
+            return self.exchange.get_assets()
 
     def get_adj_dates(self, start, end):
         now = pd.Timestamp.utcnow()
diff --git a/tests/exchange/test_bundle.py b/tests/exchange/test_bundle.py
index 0441f4a6..a7337e94 100644
--- a/tests/exchange/test_bundle.py
+++ b/tests/exchange/test_bundle.py
@@ -18,10 +18,11 @@ class ExchangeBundleTestCase:
         exchange_bundle = ExchangeBundle(
             exchange_name=exchange_name,
             data_frequency='minute',
-            include_symbols=None,
+            include_symbols='neo_btc',
             exclude_symbols=None,
             start=start,
             end=end,
             show_progress=True
         )
+        exchange_bundle.ingest()
         pass