diff --git a/AUTHORS.md b/AUTHORS.md
new file mode 100644
index 0000000000..69dc5d8e20
--- /dev/null
+++ b/AUTHORS.md
@@ -0,0 +1,57 @@
+OpenLayers contributors:
+
+* Antoine Abt
+* Mike Adair
+* Jeff Adams
+* Seb Benthall
+* Bruno Binet
+* Stéphane Brunner
+* Howard Butler
+* Bertil Chaupis
+* John Cole
+* Tim Coulter
+* Robert Coup
+* Jeff Dege
+* Roald de Wit
+* Schuyler Erle
+* Christian López Espínola
+* John Frank
+* Sean Gilles
+* Pierre Giraud
+* Ivan Grcic
+* Andreas Hocevar
+* Marc Jansen
+* Ian Johnson
+* Frédéric Junod
+* Eric Lemoine
+* Philip Lindsay
+* Martijn van Oosterhout
+* David Overstrom
+* Tom Payne
+* Corey Puffault
+* Peter William Robins
+* Gregers Rygg
+* Tim Schaub
+* Christopher Schmidt
+* Cameron Shorter
+* Pedro Simonetti
+* Paul Spencer
+* Paul Smith
+* Glen Stampoultzis
+* James Stembridge
+* Erik Uzureau
+* Bart van den Eijnden
+* Ivan Willig
+* Thomas Wood
+* Bill Woodall
+* Steve Woodbridge
+* David Zwarg
+
+Some portions of OpenLayers are used under the Apache 2.0 license, available
+in doc/licenses/APACHE-2.0.txt.
+
+Some portions of OpenLayers are used under the MIT license, availabie in
+doc/licenses/MIT-LICENSE.txt.
+
+Some portions of OpenLayers are Copyright 2001 Robert Penner, and are used
+under the BSD license, available in doc/licenses/BSD-LICENSE.txt
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0991e72756..956bd83fb2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -50,7 +50,8 @@ Use the following to run the tests:
 
     $ ./build.py test
 
-This command assumes that the `phantomjs` command is on your PATH.
+This command assumes that the `phantomjs` command is on your PATH and that the
+polvr web server is running (`./build.py serve`).
 
 ### The `precommit` target
 
diff --git a/license.txt b/LICENSE.md
similarity index 87%
rename from license.txt
rename to LICENSE.md
index cb829cc47d..f451440572 100644
--- a/license.txt
+++ b/LICENSE.md
@@ -1,13 +1,13 @@
 Copyright 2005-2013 OpenLayers Contributors. All rights reserved. See
-authors.txt for full list.
+AUTHORS.md for full list.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
- 1. Redistributions of source code must retain the above copyright notice, this
+1. Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.
 
- 2. Redistributions in binary form must reproduce the above copyright notice,
+2. Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation and/or
 other materials provided with the distribution.
 
diff --git a/readme.md b/README.md
similarity index 98%
rename from readme.md
rename to README.md
index 7c40aee999..079d686ed6 100644
--- a/readme.md
+++ b/README.md
@@ -67,7 +67,7 @@ Run the plovr web server (see above), and either open the `test/ol.html` file
 in the browser (e.g. <http://localhost:8000/test/ol.html>), or run `./build.py test`
 on the console (headless testing with PhantomJS, make sure to install it first from http://phantomjs.org/download.html).
 
-See also the test-specific [readme](https://github.com/openlayers/ol3/tree/master/test).
+See also the test-specific [README](test/README.md).
 
 ## Run the linter
 
diff --git a/authors.txt b/authors.txt
deleted file mode 100644
index 057978f513..0000000000
--- a/authors.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-OpenLayers contributors:
-
-Antoine Abt
-Mike Adair
-Jeff Adams
-Seb Benthall
-Bruno Binet
-Stéphane Brunner
-Howard Butler
-Bertil Chaupis                                                               
-John Cole
-Tim Coulter
-Robert Coup
-Jeff Dege
-Roald de Wit
-Schuyler Erle
-Christian López Espínola
-John Frank
-Sean Gilles
-Pierre Giraud
-Ivan Grcic
-Andreas Hocevar
-Marc Jansen
-Ian Johnson
-Frédéric Junod
-Eric Lemoine
-Philip Lindsay
-Martijn van Oosterhout
-David Overstrom
-Tom Payne
-Corey Puffault
-Peter William Robins
-Gregers Rygg
-Tim Schaub
-Christopher Schmidt
-Cameron Shorter                                                              
-Pedro Simonetti
-Paul Spencer                                                                 
-Paul Smith                                                                 
-Glen Stampoultzis
-James Stembridge
-Erik Uzureau
-Bart van den Eijnden
-Ivan Willig
-Thomas Wood
-Bill Woodall
-Steve Woodbridge
-David Zwarg
-
-Some portions of OpenLayers are used under the Apache 2.0 license, available
-in doc/licenses/APACHE-2.0.txt.
-
-Some portions of OpenLayers are used under the MIT license, availabie in 
-doc/licenses/MIT-LICENSE.txt.
-
-Some portions of OpenLayers are Copyright 2001 Robert Penner, and are used 
-under the BSD license, available in doc/licenses/BSD-LICENSE.txt
diff --git a/test/readme.md b/test/README.md
similarity index 76%
rename from test/readme.md
rename to test/README.md
index 123f19c54c..3d025a53a4 100644
--- a/test/readme.md
+++ b/test/README.md
@@ -22,8 +22,11 @@ With PhantomJS installed, and assuming phantomjs is in the PATH:
 
 (Works with PhantomJS 1.6.1, untested with other versions.)
 
-This command can also be run by doing `make test` at the root of ol3.
+This command can also be run by doing `./build.py test` at the root of ol3.
+
+Make sure that the polvr web server is running (`./build.py serve`), otherwise
+you will most likely see something like `0 specs, 0 failures in 0.001s.`.
 
 Tip for TDD'ers: to make PhantomJS run the test suite continuously each time
 a spec file is changed you can use nosier (http://pypi.python.org/pypi/nosier)
-and do `nosier -p test -p src "make test"`.
+and do `nosier -p test -p src "./build.py test"`.