diff --git a/.gitignore b/.gitignore
index c626e04..74c3994 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,8 @@
 [._]*.sw[a-p]
 Cargo.lock
 target
+
+# generate-tests.sh related ignores
+cmsis-svd-data
+tests/cmsis.rs
+tests/cmsis_tests
diff --git a/.gitmodules b/.gitmodules
index 9a8da72..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "cmsis-svd"]
-	path = cmsis-svd
-	url = git://github.com/posborne/cmsis-svd.git
-	update = none
diff --git a/cmsis-svd b/cmsis-svd
deleted file mode 160000
index 9c416c5..0000000
--- a/cmsis-svd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9c416c5ff18e7d272a792c13bd235ebe30eef816
diff --git a/generate-tests.sh b/generate-tests.sh
index ab3fada..c6829ea 100644
--- a/generate-tests.sh
+++ b/generate-tests.sh
@@ -24,8 +24,14 @@ main() {
     rm -rf tests/cmsis_tests
     mkdir -p tests/cmsis_tests
 
+    local svd_source=cmsis-svd-data
+    if [ ! -d $svd_source ]
+    then
+        git clone https://github.com/cmsis-svd/cmsis-svd-data.git
+    fi
+
     local vendor_dir
-    for vendor_dir in $(echo cmsis-svd/data/*); do
+    for vendor_dir in $(echo $svd_source/data/*); do
         local vendor=$(basename $vendor_dir)
         cat >"$cmsis_dir/$vendor.rs" <<EOF
 #![allow(non_snake_case)]