diff --git a/spec/runtime/languages/arithmetic/errors.txt b/spec/fixtures/corpus/arithmetic/errors.txt
similarity index 100%
rename from spec/runtime/languages/arithmetic/errors.txt
rename to spec/fixtures/corpus/arithmetic/errors.txt
diff --git a/spec/runtime/languages/arithmetic/main.txt b/spec/fixtures/corpus/arithmetic/main.txt
similarity index 100%
rename from spec/runtime/languages/arithmetic/main.txt
rename to spec/fixtures/corpus/arithmetic/main.txt
diff --git a/spec/runtime/languages/c/declarations.txt b/spec/fixtures/corpus/c/declarations.txt
similarity index 100%
rename from spec/runtime/languages/c/declarations.txt
rename to spec/fixtures/corpus/c/declarations.txt
diff --git a/spec/runtime/languages/golang/declarations.txt b/spec/fixtures/corpus/golang/declarations.txt
similarity index 100%
rename from spec/runtime/languages/golang/declarations.txt
rename to spec/fixtures/corpus/golang/declarations.txt
diff --git a/spec/runtime/languages/golang/errors.txt b/spec/fixtures/corpus/golang/errors.txt
similarity index 100%
rename from spec/runtime/languages/golang/errors.txt
rename to spec/fixtures/corpus/golang/errors.txt
diff --git a/spec/runtime/languages/golang/expressions.txt b/spec/fixtures/corpus/golang/expressions.txt
similarity index 100%
rename from spec/runtime/languages/golang/expressions.txt
rename to spec/fixtures/corpus/golang/expressions.txt
diff --git a/spec/runtime/languages/golang/statements.txt b/spec/fixtures/corpus/golang/statements.txt
similarity index 100%
rename from spec/runtime/languages/golang/statements.txt
rename to spec/fixtures/corpus/golang/statements.txt
diff --git a/spec/runtime/languages/golang/types.txt b/spec/fixtures/corpus/golang/types.txt
similarity index 100%
rename from spec/runtime/languages/golang/types.txt
rename to spec/fixtures/corpus/golang/types.txt
diff --git a/spec/runtime/languages/javascript/control_flow.txt b/spec/fixtures/corpus/javascript/control_flow.txt
similarity index 100%
rename from spec/runtime/languages/javascript/control_flow.txt
rename to spec/fixtures/corpus/javascript/control_flow.txt
diff --git a/spec/runtime/languages/javascript/errors.txt b/spec/fixtures/corpus/javascript/errors.txt
similarity index 100%
rename from spec/runtime/languages/javascript/errors.txt
rename to spec/fixtures/corpus/javascript/errors.txt
diff --git a/spec/runtime/languages/javascript/literals.txt b/spec/fixtures/corpus/javascript/literals.txt
similarity index 100%
rename from spec/runtime/languages/javascript/literals.txt
rename to spec/fixtures/corpus/javascript/literals.txt
diff --git a/spec/runtime/languages/javascript/operators.txt b/spec/fixtures/corpus/javascript/operators.txt
similarity index 100%
rename from spec/runtime/languages/javascript/operators.txt
rename to spec/fixtures/corpus/javascript/operators.txt
diff --git a/spec/runtime/languages/json/errors.txt b/spec/fixtures/corpus/json/errors.txt
similarity index 100%
rename from spec/runtime/languages/json/errors.txt
rename to spec/fixtures/corpus/json/errors.txt
diff --git a/spec/runtime/languages/json/main.txt b/spec/fixtures/corpus/json/main.txt
similarity index 100%
rename from spec/runtime/languages/json/main.txt
rename to spec/fixtures/corpus/json/main.txt
diff --git a/spec/runtime/helpers/read_test_entries.cc b/spec/runtime/helpers/read_test_entries.cc
index 4bfa6b69..7750329a 100644
--- a/spec/runtime/helpers/read_test_entries.cc
+++ b/spec/runtime/helpers/read_test_entries.cc
@@ -102,7 +102,7 @@ static string src_dir() {
 
 vector<TestEntry> test_entries_for_language(string language) {
   vector<TestEntry> result;
-  string language_dir = src_dir() + "/spec/runtime/languages/" + language;
+  string language_dir = src_dir() + "/spec/fixtures/corpus/" + language;
   vector<string> filenames = list_directory(language_dir);
 
   for (string &filename : filenames) {
diff --git a/spec/runtime/languages/language_specs.cc b/spec/runtime/language_specs.cc
similarity index 100%
rename from spec/runtime/languages/language_specs.cc
rename to spec/runtime/language_specs.cc