diff --git a/telegram/ext/updater.py b/telegram/ext/updater.py
index 72b3dc30c..20088dfd5 100644
--- a/telegram/ext/updater.py
+++ b/telegram/ext/updater.py
@@ -29,8 +29,9 @@ from time import sleep
 import subprocess
 from signal import signal, SIGINT, SIGTERM, SIGABRT
 from telegram import Bot, TelegramError, NullHandler
-from telegram.ext import dispatcher, Dispatcher, JobQueue, UpdateQueue
+from telegram.ext import dispatcher, Dispatcher, JobQueue
 from telegram.error import Unauthorized, InvalidToken
+from telegram.utils.updatequeue import UpdateQueue
 from telegram.utils.webhookhandler import (WebhookServer, WebhookHandler)
 
 logging.getLogger(__name__).addHandler(NullHandler())
diff --git a/tests/test_updater.py b/tests/test_updater.py
index 7883b545e..32a522b98 100644
--- a/tests/test_updater.py
+++ b/tests/test_updater.py
@@ -48,7 +48,7 @@ except ImportError:
 sys.path.append('.')
 
 from telegram import Update, Message, TelegramError, User, Chat, Bot
-from telegram.ext.updater import Updater
+from telegram.ext import Updater
 from telegram.ext.dispatcher import run_async
 from telegram.error import Unauthorized, InvalidToken
 from tests.base import BaseTest