diff --git a/.gitmodules b/.gitmodules
index b9f03df..5f52f21 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "roles"]
-	path = roles
+	path = playbooks/roles
 	url = https://git.foo.sh/ansible-software.git
diff --git a/ansible.cfg b/ansible.cfg
index 89b93c9..be51cad 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,6 +1,5 @@
 [defaults]
 inventory = ./hosts
-roles_path = ./roles
 
 gathering = smart
 fact_caching = jsonfile
diff --git a/roles b/playbooks/roles
similarity index 100%
rename from roles
rename to playbooks/roles
diff --git a/tests/01-yamllint.sh b/tests/01-yamllint.sh
index 8f0dfe9..a6c8c99 100755
--- a/tests/01-yamllint.sh
+++ b/tests/01-yamllint.sh
@@ -2,5 +2,5 @@
 
 cd "$(dirname "$0")/.." || exit 1
 
-find . -type f -name "*.yml" -not -path "./roles/*" -print0 | \
+find . -type f -name "*.yml" -not -path "./playbooks/roles/*" -print0 | \
     xargs -0 -t -n 1 yamllint -s --
diff --git a/tests/02-ansiblelint.sh b/tests/02-ansiblelint.sh
index 7696e20..9885996 100755
--- a/tests/02-ansiblelint.sh
+++ b/tests/02-ansiblelint.sh
@@ -2,5 +2,5 @@
 
 cd "$(dirname "$0")/.." || exit 1
 
-find . -name "*.yml" -not -path "./roles/*" -print0 | \
+find . -name "*.yml" -not -path "./playbooks/roles/*" -print0 | \
     xargs -0 -t -n 1 -- ansible-lint -x meta-no-info --