diff --git a/.travis.yml b/.travis.yml
index 43e5ce24c..18471bb07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,8 @@ mono: none
 
 # ASF requires .NET Core 2.0+
 # TODO: We should target stable 2.0.0 once it's released
+# TODO: Update at least to preview2 once https://github.com/travis-ci/travis-ci/issues/8037 is fixed
+# TODO: Add --no-restore to dotnet test when we get preview2+
 dotnet: 2.0.0-preview1-005977
 
 env:
@@ -28,7 +30,7 @@ script:
   - set -e
   - dotnet restore
   - dotnet build -c Release
-  - dotnet test -c Release --no-build --no-restore ArchiSteamFarm.Tests
+  - dotnet test -c Release --no-build ArchiSteamFarm.Tests
   - dotnet publish -c Release -o out/generic
   - echo "generic" > "ArchiSteamFarm/out/generic/ArchiSteamFarm.version"
   - dotnet publish -c Release -r win-x64 -o out/win-x64
@@ -40,16 +42,17 @@ script:
   - dotnet publish -c Release -r osx-x64 -o out/osx-x64
   - echo "osx-x64" > "ArchiSteamFarm/out/osx-x64/ArchiSteamFarm.version"
 
-# This is our main build matrix
 matrix:
-# We can use fast finish, as we don't need to wait for all builds to mark it as failed/passed
+  # We can use fast finish, as we don't need to wait for allow_failures builds to mark build as success
   fast_finish: true
   allow_failures:
-    # We allow OS X to fail until https://github.com/travis-ci/travis-ci/issues/7757 is fixed
+    # TODO: We allow OS X to fail until https://github.com/travis-ci/travis-ci/issues/7757 is fixed
     - os: osx
   include:
-#   We're building ASF with dotnet on latest versions of Linux and OS X
-#   Ref: https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
+    # We're building ASF with dotnet on latest versions of Linux and OS X
+    # Ref: https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
+    # Ref: https://docs.travis-ci.com/user/trusty-ci-environment/
+    # Ref: https://docs.travis-ci.com/user/osx-ci-environment/
     - os: linux
       dist: trusty
       sudo: false