diff --git a/test-old/functional/routes_test.rb b/test/functional
similarity index 100%
rename from test-old/functional/routes_test.rb
rename to test/functional
diff --git a/test-old/unit/diff_test.rb b/test/uni
similarity index 100%
rename from test-old/unit/diff_test.rb
rename to test/uni
diff --git a/test-old/unit/chunks/category_test.rb b/test/unit/chunks/category_test.rb
similarity index 100%
rename from test-old/unit/chunks/category_test.rb
rename to test/unit/chunks/category_test.rb
diff --git a/test-old/unit/chunks/nowiki_test.rb b/test/unit/chunks/nowiki_test.rb
similarity index 100%
rename from test-old/unit/chunks/nowiki_test.rb
rename to test/unit/chunks/nowiki_test.rb
diff --git a/test-old/unit/chunks/wiki_test.rb b/test/unit/chunks/wiki_test.rb
similarity index 100%
rename from test-old/unit/chunks/wiki_test.rb
rename to test/unit/chunks/wiki_test.rb
diff --git a/test-old/unit/file_yard_test.rb b/test/unit/file_yard_test.rb
similarity index 100%
rename from test-old/unit/file_yard_test.rb
rename to test/unit/file_yard_test.rb
diff --git a/test-old/unit/redcloth_for_tex_test.rb b/test/unit/redcloth_for_tex_test.rb
similarity index 100%
rename from test-old/unit/redcloth_for_tex_test.rb
rename to test/unit/redcloth_for_tex_test.rb
diff --git a/test-old/unit/uri_test.rb b/test/unit/uri_test.rb
similarity index 100%
rename from test-old/unit/uri_test.rb
rename to test/unit/uri_test.rb
diff --git a/test-old/unit/wiki_words_test.rb b/test/unit/wiki_words_test.rb
similarity index 100%
rename from test-old/unit/wiki_words_test.rb
rename to test/unit/wiki_words_test.rb