diff --git a/docker/ci/entrypoint.sh b/docker/ci/entrypoint.sh
index acddb089af7..4f9b3b5d681 100755
--- a/docker/ci/entrypoint.sh
+++ b/docker/ci/entrypoint.sh
@@ -156,22 +156,24 @@ setup_tests() {
 }
 
 run_units() {
-	shopt -s extglob
+	shopt -s extglob globstar nullglob
 	reset_dbs
-	execute "time bundle exec turbo_tests --verbose -n $JOBS --runtime-log spec/support/runtime-logs/turbo_runtime_units.log {,modules/*/}spec/!(features)"
+	execute "time bundle exec turbo_tests --verbose -n $JOBS --runtime-log spec/support/runtime-logs/turbo_runtime_units.log {,modules/*/}spec/{!(features)/**/,}*_spec.rb"
 	cleanup
 }
 
 run_features() {
+	shopt -s globstar nullglob
 	run_background start_hocuspocus
 	reset_dbs
-	execute "time bundle exec turbo_tests --verbose -n $JOBS --runtime-log spec/support/runtime-logs/turbo_runtime_features.log {,modules/*/}spec/features"
+	execute "time bundle exec turbo_tests --verbose -n $JOBS --runtime-log spec/support/runtime-logs/turbo_runtime_features.log {,modules/*/}spec/features/**/*_spec.rb"
 	cleanup
 }
 
 run_all() {
+	shopt -s globstar nullglob
 	reset_dbs
-	execute "time bundle exec turbo_tests --verbose -n $JOBS --runtime-log spec/support/runtime-logs/turbo_runtime_all.log {,modules/*/}spec"
+	execute "time bundle exec turbo_tests --verbose -n $JOBS --runtime-log spec/support/runtime-logs/turbo_runtime_all.log {,modules/*/}spec/**/*_spec.rb"
 	cleanup
 }
 
diff --git a/spec/features/security/plain_text_content_type.rb b/spec/features/security/plain_text_content_type_spec.rb
similarity index 100%
rename from spec/features/security/plain_text_content_type.rb
rename to spec/features/security/plain_text_content_type_spec.rb
diff --git a/spec/permissions/edit_own_work_package_comments.rb b/spec/permissions/edit_own_work_package_comments_spec.rb
similarity index 100%
rename from spec/permissions/edit_own_work_package_comments.rb
rename to spec/permissions/edit_own_work_package_comments_spec.rb
diff --git a/spec/permissions/edit_work_package_comments.rb b/spec/permissions/edit_work_package_comments_spec.rb
similarity index 100%
rename from spec/permissions/edit_work_package_comments.rb
rename to spec/permissions/edit_work_package_comments_spec.rb