diff --git a/src/ipc/ipc_path_manager_test.cc b/src/ipc/ipc_path_manager_test.cc
index dd97fc04d..28161fd9d 100644
--- a/src/ipc/ipc_path_manager_test.cc
+++ b/src/ipc/ipc_path_manager_test.cc
@@ -121,7 +121,7 @@ TEST_F(IPCPathManagerTest, IPCPathManagerTest) {
 TEST_F(IPCPathManagerTest, IPCPathManagerBatchTest) {
   // mozc::Thread is not designed as value-semantics.
   // So here we use pointers to maintain these instances.
-  vector<BatchGetPathNameThread *> threads(8192);
+  vector<BatchGetPathNameThread *> threads(64);
   for (size_t i = 0; i < threads.size(); ++i) {
     threads[i] = new BatchGetPathNameThread;
     threads[i]->Start();
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 7316f574c..0383bc4af 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2307
+BUILD=2308
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.