diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index ec67b71..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "samplecode/wasmi/test_input"]
-	path = samplecode/wasmi/test_input
-	url = https://github.com/WebAssembly/testsuite
diff --git a/samplecode/wasmi/.gitignore b/samplecode/wasmi/.gitignore
new file mode 100644
index 0000000..f51338b
--- /dev/null
+++ b/samplecode/wasmi/.gitignore
@@ -0,0 +1 @@
+/test_input/
diff --git a/samplecode/wasmi/Makefile b/samplecode/wasmi/Makefile
index 32ecf55..c3e9c2f 100644
--- a/samplecode/wasmi/Makefile
+++ b/samplecode/wasmi/Makefile
@@ -149,7 +149,11 @@
 
 .PHONY: enclave
 enclave:
-	(cd ../.. && git submodule init && git submodule update)
+	@if [ ! -d test_input ]; then\
+		git clone https://github.com/WebAssembly/testsuite test_input &&\
+		cd test_input &&\
+		git checkout c6a690f ;\
+	fi
 	$(MAKE) -C ./enclave/
 
 
diff --git a/samplecode/wasmi/test_input b/samplecode/wasmi/test_input
deleted file mode 160000
index c6a690f..0000000
--- a/samplecode/wasmi/test_input
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6a690f89a0dda3c79700aa6377d8b5d8a970eba