diff --git a/test/test-executor.cc b/test/test-executor.cc
new file mode 100644
index 0000000..5236234
--- /dev/null
+++ b/test/test-executor.cc
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2013 University of California, Los Angeles
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
+ *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ */
+
+
+#include <boost/test/unit_test.hpp>
+#include "executor.h"
+
+using namespace boost;
+using namespace std;
+
+void timeConsumingJob()
+{
+  cout << "Start sleep" << endl;
+  sleep(1);
+  cout << "finish sleep" << endl;
+}
+
+BOOST_AUTO_TEST_CASE(ExecutorTest)
+{
+  Executor executor(3);
+  Executor::Job job = bind(timeConsumingJob);
+
+  executor.execute(job);
+  executor.execute(job);
+
+  usleep(100);
+  // both jobs should have been taken care of
+  BOOST_CHECK_EQUAL(executor.jobQueueSize(), 0);
+
+  usleep(500000);
+
+  // add four jobs while only one thread is idle
+  executor.execute(job);
+  executor.execute(job);
+  executor.execute(job);
+  executor.execute(job);
+
+  usleep(100);
+  // three jobs should remain in queue
+  BOOST_CHECK_EQUAL(executor.jobQueueSize(), 3);
+
+  usleep(500000);
+  // two threads should have finished and 
+  // take care of two queued jobs
+  BOOST_CHECK_EQUAL(executor.jobQueueSize(), 1);
+
+  // all jobs should have been fetched
+  usleep(500100);
+  BOOST_CHECK_EQUAL(executor.jobQueueSize(), 0);
+
+  sleep(1);
+
+}