diff --git a/ci/if_feat_check.vim b/ci/if_feat_check.vim
new file mode 100644
index 0000000..f846f7c
--- /dev/null
+++ b/ci/if_feat_check.vim
@@ -0,0 +1,15 @@
+if 1 " This prevents it from being run in tiny versions
+  " Check for required features
+  if exists("g:required")
+    for feature in g:required
+      if !has(feature)
+        echo "Error: Feature '" .. feature .. "' not found"
+        echo ''
+        cquit
+      endif
+    endfor
+    echo "\nChecked features: " .. string(g:required)
+    echo ''
+  endif
+endif
+" vim: sts=2 sw=2 et
diff --git a/ci/if_ver-1.vim b/ci/if_ver-1.vim
index adc40a7..397c05a 100644
--- a/ci/if_ver-1.vim
+++ b/ci/if_ver-1.vim
@@ -1,6 +1,6 @@
-" Print all interface versions for Ubuntu. Part 1.
+" Print all interface versions. Part 1.
 
-if 1
+if 1 " This prevents it from being run in tiny versions
   execute 'source' expand('<sfile>:h') .. '/if_ver-cmd.vim'
 
   echo "*** Interface versions ***\n"
diff --git a/ci/if_ver-2.vim b/ci/if_ver-2.vim
index 83e80e4..f717ec1 100644
--- a/ci/if_ver-2.vim
+++ b/ci/if_ver-2.vim
@@ -1,6 +1,8 @@
-" Print py3 interface versions for Ubuntu. Part 2.
+" Print py3 interface versions. Part 2.
+" This is done separately from part 1 because Vim cannot concurrently load
+" Python 2 and 3 together.
 
-if 1
+if 1 " This prevents it from being run in tiny versions
   execute 'source' expand('<sfile>:h') .. '/if_ver-cmd.vim'
 
   echo 'Python 3:'