diff --git a/test/builtin_function_test.cc b/test/builtin_function_test.cc
index b54d974..88adad3 100644
--- a/test/builtin_function_test.cc
+++ b/test/builtin_function_test.cc
@@ -3,7 +3,6 @@
 #include "wamon/interpreter.h"
 #include "wamon/parser.h"
 #include "wamon/scanner.h"
-#include "wamon/static_analyzer.h"
 #include "wamon/type_checker.h"
 #include "wamon/variable.h"
 
diff --git a/test/executable_block_stmt_test.cc b/test/executable_block_stmt_test.cc
index e637098..b29b52b 100644
--- a/test/executable_block_stmt_test.cc
+++ b/test/executable_block_stmt_test.cc
@@ -19,6 +19,20 @@
 
 using namespace wamon;
 
+std::unique_ptr<ExecutableBlockStmt> get_executable_block_stmt() {
+  auto executable_block_stmt = [](Interpreter& ip) -> std::shared_ptr<Variable> {
+    auto va = ip.FindVariableById("main$param_a");
+    auto vref = ip.FindVariableById("main$param_ref");
+    va = ip.CallFunctionByName("main$update_value_from_script", {va});
+    int ret = AsIntVariable(va)->GetValue();
+    AsStringVariable(vref)->SetValue("changed");
+    return std::make_shared<IntVariable>(ret * 2, Variable::ValueCategory::RValue, "");
+  };
+  auto executable_block = std::make_unique<ExecutableBlockStmt>();
+  executable_block->SetExecutable(std::move(executable_block_stmt));
+  return executable_block;
+}
+
 std::shared_ptr<FunctionDef> generate_func_for_test() {
   std::shared_ptr<FunctionDef> fd(new FunctionDef("my_fn"));
   fd->AddParamList({
@@ -34,18 +48,7 @@ std::shared_ptr<FunctionDef> generate_func_for_test() {
   });
 
   fd->SetReturnType(TypeFactory<int>::Get());
-
-  auto executable_block = std::make_unique<ExecutableBlockStmt>();
-  executable_block->SetExecutable([](Interpreter& ip) -> std::shared_ptr<Variable> {
-    auto va = ip.FindVariableById("main$param_a");
-    auto vref = ip.FindVariableById("main$param_ref");
-    va = ip.CallFunctionByName("main$update_value_from_script", {va});
-    int ret = AsIntVariable(va)->GetValue();
-    AsStringVariable(vref)->SetValue("changed");
-    return std::make_shared<IntVariable>(ret * 2, Variable::ValueCategory::RValue, "");
-  });
-
-  fd->SetBlockStmt(std::move(executable_block));
+  fd->SetBlockStmt(get_executable_block_stmt());
   return fd;
 }
 
diff --git a/test/static_analysis_test.cc b/test/static_analysis_test.cc
index 1e87ee9..5a8e732 100644
--- a/test/static_analysis_test.cc
+++ b/test/static_analysis_test.cc
@@ -4,7 +4,6 @@
 #include "wamon/exception.h"
 #include "wamon/parser.h"
 #include "wamon/scanner.h"
-#include "wamon/static_analyzer.h"
 #include "wamon/type_checker.h"
 
 TEST(static_analysis, base) {