diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index b7a0e4f2b..000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-build: off
-
-init:
-  - git config --global core.autocrlf input
-
-install:
-  - cinst jdk8 -params 'installdir=C:\\jdk8'
-  - cinst jdk11 -params 'installdir=C:\\jdk11'
-  - SET JAVA_HOME=C:\jdk8
-  - SET PATH=C:\jdk8\bin;%PATH%
-
-  - ps: |
-      Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\sbt" )) {
-        (new-object System.Net.WebClient).DownloadFile(
-          'https://piccolo.link/sbt-0.13.18.zip',
-          'C:\sbt-bin.zip'
-        )
-        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sbt-bin.zip", "C:\sbt")
-      }
-  - SET PATH=C:\sbt\sbt\bin;%PATH%
-  - SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8
-
-test_script:
-  - sbt "-Dsbt.build.version=1.3.0-M4" universal:packageBin
-  - cd citest
-  - test.bat
-  - test1.bat
-  - test2.bat
-  - test3/test3.bat
diff --git a/.gitignore b/.gitignore
index 87178428e..f495d67cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ src_managed
 /template-project/project/boot
 *~
 /citest/freshly-baked/
+/upload/cookies
diff --git a/.travis.yml b/.travis.yml
index 56fe99a41..b26654512 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,12 @@ scala: 2.10.7
 
 env:
   global:
-    - SBT_VER=1.3.0-M4
+    - SBT_VER=1.3.0
     - TRAVIS_JDK=adopt@1.8.212-04
     - JABBA_HOME=$HOME/.jabba
     - TRAVIS_JDK11=openjdk@1.11.0
+    ## ignore Travis CI's default /etc/sbt/sbtopts
+    - SBT_ETC_FILE=$HOME/etc/sbt/sbtopts
 
 matrix:
   include:
@@ -41,6 +43,7 @@ matrix:
       install:
         - $JABBA_HOME/bin/jabba install $TRAVIS_JDK && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK/Contents/Home" && export PATH="$JAVA_HOME/bin:$PATH"
         - java -Xmx32m -version
+        - unset SBT_OPTS
       script:
         - sbt -Dsbt.build.version=$SBT_VER universal:packageBin
         - cd citest && ./test.sh
@@ -72,6 +75,7 @@ before_install:
 install:
   - $JABBA_HOME/bin/jabba install $TRAVIS_JDK && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH"
   - java -Xmx32m -version
+  - unset SBT_OPTS
 
 cache:
   directories:
diff --git a/citest/build.sbt b/citest/build.sbt
index 19f66a715..567f42ae1 100644
--- a/citest/build.sbt
+++ b/citest/build.sbt
@@ -18,12 +18,5 @@ lazy val root = (project in file("."))
       val ys = IO.readLines(file("err.txt")).toVector.distinct
 
       assert(ys.isEmpty, s"there's an stderr: $ys")
-    },
-
-    check2 := {
-      val xs = IO.readLines(file("output.txt")).toVector
-      println(xs)
-      val ys = IO.readLines(file("err.txt")).toVector.distinct
-      assert(!ys.exists(_.contains("Ignoring option MaxPermSize; support was removed in 8.0")), s"there's an stderr: $ys")
     }
   )
diff --git a/citest/test.sh b/citest/test.sh
index 2dc2870b9..3cac58991 100755
--- a/citest/test.sh
+++ b/citest/test.sh
@@ -15,7 +15,7 @@ unzip -qo ../target/universal/sbt.zip -d ./freshly-baked
 
 ./freshly-baked/sbt/bin/sbt -Dsbt.no.format=true about
 ./freshly-baked/sbt/bin/sbt -Dsbt.no.format=true about 1> output.txt 2> err.txt
-./freshly-baked/sbt/bin/sbt check2
+./freshly-baked/sbt/bin/sbt check
 
 ./freshly-baked/sbt/bin/sbt about run -v
 
diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt
index d72201d0a..4907c64c7 100755
--- a/src/universal/bin/sbt
+++ b/src/universal/bin/sbt
@@ -385,6 +385,8 @@ run() {
 declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
 declare -r sbt_opts_file=".sbtopts"
 declare -r etc_sbt_opts_file="/etc/sbt/sbtopts"
+# this allows /etc/sbt/sbtopts location to be changed
+declare -r etc_file="${SBT_ETC_FILE:-$etc_sbt_opts_file}"
 declare -r dist_sbt_opts_file="${sbt_home}/conf/sbtopts"
 declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt"
 
@@ -546,7 +548,7 @@ loadConfigFile() {
 [[ -f "$dist_sbt_opts_file" ]] && set -- $(loadConfigFile "$dist_sbt_opts_file") "$@"
 
 # Here we pull in the global settings configuration.
-[[ -f "$etc_sbt_opts_file" ]] && set -- $(loadConfigFile "$etc_sbt_opts_file") "$@"
+[[ -f "$etc_file" ]] && set -- $(loadConfigFile "$etc_file") "$@"
 
 # Pull in the project-level config file, if it exists.
 [[ -f "$sbt_opts_file" ]] && set -- $(loadConfigFile "$sbt_opts_file") "$@"