diff --git a/middleman-core/features/unicode_filenames.feature b/middleman-core/features/unicode_filenames.feature
index 1e1c8dcc..83b65c9f 100644
--- a/middleman-core/features/unicode_filenames.feature
+++ b/middleman-core/features/unicode_filenames.feature
@@ -1,14 +1,36 @@
+@encoding
+
 Feature: Unicode filenames
   In order to support non-ASCII characters in filenames
 
-  #Scenario: Build with files containing unicode characters in their name
-  #  Given a successfully built app at "unicode-filenames-app"
-  #  When I cd to "build"
-  #   Then the file "snowmen-rule-☃.html" should contain "☃"
+  Scenario: Build with files containing unicode characters in their name
+    Given a fixture app "empty-app"
+    And a file named "config.rb" with:
+      """
+      """
+    And a file named "source/snowmen-rule-☃.html" with:
+      """
+      Snowman!
+      <div style="text-align:center; font-size:4000%;">
+        ☃
+      </div>
+      """
+    And a successfully built app at "empty-app"
+    When I cd to "build"
+    Then the file "snowmen-rule-☃.html" should contain "☃"
 
   Scenario: Preview with files containing unicode characters in their name
-    Given the Server is running at "unicode-filenames-app"
+    Given a fixture app "empty-app"
+    And a file named "config.rb" with:
+      """
+      """
+    And a file named "source/snowmen-rule-☃.html" with:
+      """
+      Snowman!
+      <div style="text-align:center; font-size:4000%;">
+        ☃
+      </div>
+      """
+    And the Server is running
     When I go to "/snowmen-rule-☃.html"
-    # There seem to be encoding issues w/ the test framework so we can't check the content
-    Then I should see "Snowman!"
-    
\ No newline at end of file
+    Then I should see "Snowman!"
\ No newline at end of file
diff --git a/middleman-core/fixtures/unicode-filenames-app/config.rb b/middleman-core/fixtures/unicode-filenames-app/config.rb
deleted file mode 100644
index 8b137891..00000000
--- a/middleman-core/fixtures/unicode-filenames-app/config.rb
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/middleman-core/fixtures/unicode-filenames-app/source/snowmen-rule-☃.html b/middleman-core/fixtures/unicode-filenames-app/source/snowmen-rule-☃.html
deleted file mode 100644
index 7a24bbca..00000000
--- a/middleman-core/fixtures/unicode-filenames-app/source/snowmen-rule-☃.html
+++ /dev/null
@@ -1,4 +0,0 @@
-Snowman!
-<div style="text-align:center; font-size:4000%;">
-  ☃
-</div>