diff --git a/tests/test_telebot.py b/tests/test_telebot.py
new file mode 100644
index 0000000..22629d2
--- /dev/null
+++ b/tests/test_telebot.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+import sys
+import time
+
+sys.path.append('../')
+from telebot import types
+import telebot
+
+
+def test_message_listener():
+    msg_list = []
+    for x in range(100):
+        msg_list.append(create_text_message('Message ' + str(x)))
+
+    def listener(messages):
+        assert len(messages) == 100
+
+    tb = telebot.TeleBot('')
+    tb.set_update_listener(listener)
+
+
+def test_message_handler():
+    tb = telebot.TeleBot('')
+    msg = create_text_message('/help')
+
+    @tb.message_handler(commands=['help', 'start'])
+    def command_handler(message):
+        message.text = 'got'
+
+    tb.process_new_messages([msg])
+    time.sleep(1)
+    assert msg.text == 'got'
+
+
+def create_text_message(text):
+    params = {}
+    params['text'] = text
+    return types.Message(1, None, None, 1, 'text', params)
+