diff --git a/appveyor.yml b/appveyor.yml
index aa7d802e0..9c1495c57 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -80,9 +80,9 @@ test_script:
         echo "spec runner not found (compile error?)"
         exit 1
       }
-      Write-Host "Explicitly testing the case when cwd has Cyrillic characters: " -nonewline
+      Write-Host "Explicitly testing the case when cwd has Unicode characters: " -nonewline
       # See comments in gh-1774 for details.
-      cd sass-spec/spec/libsass/Sáss-UŢF8/
+      cd test/e2e/unicode-pwd/Sáss-UŢF8/
       &$env:TargetPath ./input.scss 2>&1>$null
       if(-not($?)) {
         echo "Failed!"
diff --git a/test/Makefile b/test/Makefile
index f30131119..f990a43d6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -21,4 +21,4 @@ build/test_util_string: test_util_string.cpp ../src/util_string.cpp | build
 clean: | build
 	rm -rf build
 
-.PHONY: test test_shared_ptr clean
+.PHONY: test test_shared_ptr test_util_string clean
diff --git "a/test/e2e/unicode-pwd/Sa\314\201ss-UT\314\247F8/input.scss" "b/test/e2e/unicode-pwd/Sa\314\201ss-UT\314\247F8/input.scss"
new file mode 100644
index 000000000..2d4b28778
--- /dev/null
+++ "b/test/e2e/unicode-pwd/Sa\314\201ss-UT\314\247F8/input.scss"
@@ -0,0 +1,3 @@
+span.utf8-in-path {
+  margin: auto;
+}
diff --git "a/test/e2e/unicode-pwd/Sa\314\201ss-UT\314\247F8/output.css" "b/test/e2e/unicode-pwd/Sa\314\201ss-UT\314\247F8/output.css"
new file mode 100644
index 000000000..2d4b28778
--- /dev/null
+++ "b/test/e2e/unicode-pwd/Sa\314\201ss-UT\314\247F8/output.css"
@@ -0,0 +1,3 @@
+span.utf8-in-path {
+  margin: auto;
+}
diff --git "a/test/e2e/unicode-pwd/S\303\241ss-U\305\242F8/input.scss" "b/test/e2e/unicode-pwd/S\303\241ss-U\305\242F8/input.scss"
new file mode 100644
index 000000000..2d4b28778
--- /dev/null
+++ "b/test/e2e/unicode-pwd/S\303\241ss-U\305\242F8/input.scss"
@@ -0,0 +1,3 @@
+span.utf8-in-path {
+  margin: auto;
+}
diff --git "a/test/e2e/unicode-pwd/S\303\241ss-U\305\242F8/output.css" "b/test/e2e/unicode-pwd/S\303\241ss-U\305\242F8/output.css"
new file mode 100644
index 000000000..2d4b28778
--- /dev/null
+++ "b/test/e2e/unicode-pwd/S\303\241ss-U\305\242F8/output.css"
@@ -0,0 +1,3 @@
+span.utf8-in-path {
+  margin: auto;
+}