diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 50f56bdc..b31d6275 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,4 +43,6 @@ Always welcome.
 
 Code should follow the [Android Code Style Guidelines](https://source.android.com/source/code-style.html#java-language-rules). This can be done automatically in Android Studio.
 
+Unit tests are available, and can be executed with `gradle connectedAndroidTest`, or from Android Studio. New code should always add or improve related tests.
+
 Lint warnings should be fixed. If that's not possible, they should be ignored as specifically as possible.
diff --git a/README.md b/README.md
index 41a41fd4..c09e1c8a 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,8 @@ To get Syncthing app for Android running on you device/emulator the native synct
 
 ## Development Notes
 
+It is recommended to change the GUI and Listen Address ports for the debug app, eg to 8081 and 22001 respectively.
+
 The syncthing backend used for this android application provides a web interface by default. It can be accessed via the Settings menu -> 'Web GUI'. It is quite helpful to access this web interface from your development machine. Read [android documentation](http://developer.android.com/tools/devices/emulator.html#redirection) on how to access the network of your emulator. Or use the following steps to connect to the single currently running emulator/AVD.
 - `telnet localhost 5554`
 - `redir add tcp:18080:8080`