1 files changed, 16 insertions, 16 deletions
diff --git a/test/command_callback/test_flake8_command_callback.vader b/test/command_callback/test_flake8_command_callback.vader
index 3cf1ed0c..81efe497 100644
--- a/test/command_callback/test_flake8_command_callback.vader
+++ b/test/command_callback/test_flake8_command_callback.vader
@@ -56,7 +56,7 @@ Execute(The option for disabling changing directories should work):
   \]
 
 Execute(The option for changing directory to project root should work):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_tox/namespace/foo/bar.py')
+  silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_tox/namespace/foo/bar.py')
 
   AssertLinterCwd ale#python#FindProjectRootIni(bufnr(''))
   call ale#semver#ResetVersionCache()
@@ -67,7 +67,7 @@ Execute(The option for changing directory to project root should work):
 
 Execute(The option for changing directory to file dir should work):
   let g:ale_python_flake8_change_directory = 'file'
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_tox/namespace/foo/bar.py')
+  silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_tox/namespace/foo/bar.py')
 
   AssertLinter 'flake8', [
   \ ale#Escape('flake8') . ' --version',
@@ -110,10 +110,10 @@ Execute(You should be able to set a custom executable and it should be escaped):
   \]
 
 Execute(The flake8 callbacks should detect virtualenv directories):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
+  silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py')
 
   let b:executable = ale#path#Simplify(
-  \ g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/flake8'
+  \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/flake8'
   \)
 
   AssertLinter b:executable, [
@@ -124,43 +124,43 @@ Execute(The flake8 callbacks should detect virtualenv directories):
   \]
 
 Execute(The FindProjectRoot should detect the project root directory for namespace package via Manifest.in):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_manifest/namespace/foo/bar.py')
+  silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_manifest/namespace/foo/bar.py')
 
   AssertEqual
-  \ ale#path#Simplify(g:dir . '/python_paths/namespace_package_manifest'),
+  \ ale#path#Simplify(g:dir . '/../test-files/python/namespace_package_manifest'),
   \ ale#python#FindProjectRoot(bufnr(''))
 
 Execute(The FindProjectRoot should detect the project root directory for namespace package via setup.cf):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_setup/namespace/foo/bar.py')
+  silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_setup/namespace/foo/bar.py')
 
   AssertEqual
-  \ ale#path#Simplify(g:dir . '/python_paths/namespace_package_setup'),
+  \ ale#path#Simplify(g:dir . '/../test-files/python/namespace_package_setup'),
   \ ale#python#FindProjectRoot(bufnr(''))
 
 Execute(The FindProjectRoot should detect the project root directory for namespace package via pytest.ini):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_pytest/namespace/foo/bar.py')
+  silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_pytest/namespace/foo/bar.py')
 
   AssertEqual
-  \ ale#path#Simplify(g:dir . '/python_paths/namespace_package_pytest'),
+  \ ale#path#Simplify(g:dir . '/../test-files/python/namespace_package_pytest'),
   \ ale#python#FindProjectRoot(bufnr(''))
 
 Execute(The FindProjectRoot should detect the project root directory for namespace package via tox.ini):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/namespace_package_tox/namespace/foo/bar.py')
+  silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/namespace_package_tox/namespace/foo/bar.py')
 
   AssertEqual
-  \ ale#path#Simplify(g:dir . '/python_paths/namespace_package_tox'),
+  \ ale#path#Simplify(g:dir . '/../test-files/python/namespace_package_tox'),
   \ ale#python#FindProjectRoot(bufnr(''))
 
 Execute(The FindProjectRoot should detect the project root directory for non-namespace package):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/no_virtualenv/subdir/foo/bar.py')
+  silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/no_virtualenv/subdir/foo/bar.py')
 
   AssertEqual
-  \ ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir'),
+  \ ale#path#Simplify(g:dir . '/../test-files/python/no_virtualenv/subdir'),
   \ ale#python#FindProjectRoot(bufnr(''))
 
 " Some users currently run flake8 this way, so we should support it.
 Execute(Using `python -m flake8` should be supported for running flake8):
-  silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
+  silent execute 'file ' . fnameescape(g:dir . '/../test-files/python/with_virtualenv/subdir/foo/bar.py')
 
   let g:ale_python_flake8_executable = 'python'
   let g:ale_python_flake8_options = '-m flake8 --some-option'
@@ -194,7 +194,7 @@ Execute(Setting executable to 'pipenv' should append 'run flake8'):
 
 Execute(Pipenv is detected when python_flake8_auto_pipenv is set):
   let g:ale_python_flake8_auto_pipenv = 1
-  call ale#test#SetFilename('../python_fixtures/pipenv/whatever.py')
+  call ale#test#SetFilename('../test-files/python/pipenv/whatever.py')
 
   AssertLinterCwd ale#python#FindProjectRootIni(bufnr(''))
   AssertLinter 'pipenv',