diff --git a/test/utils/shippable/shippable.sh b/test/utils/shippable/shippable.sh
index dd42eb7add..e22966d5ca 100755
--- a/test/utils/shippable/shippable.sh
+++ b/test/utils/shippable/shippable.sh
@@ -24,6 +24,9 @@ pip list --disable-pip-version-check
 export PATH="test/runner:${PATH}"
 reorganize-tests.sh # temporary solution until repositories are merged
 
+# remove empty core/extras module directories from PRs created prior to the repo-merge
+find lib/ansible/modules -type d -empty -print -delete
+
 function cleanup
 {
     if [ "$(ls test/results/coverage/)" ]; then