diff --git a/Jenkinsfile.public b/Jenkinsfile.public
index 14bd158df..35c998c6d 100644
--- a/Jenkinsfile.public
+++ b/Jenkinsfile.public
@@ -103,6 +103,20 @@ pipeline {
                     }
                 }
 
+                stage('Cockroach Integration') {
+                    environment {
+                        STORJ_NETWORK_HOST4 = '127.0.0.4'
+                        STORJ_NETWORK_HOST6 = '127.0.0.4'
+
+                        STORJ_SIM_POSTGRES = 'cockroach://root@localhost:26257/testcockroach4?sslmode=disable'
+                    }
+
+                    steps {
+                        sh 'cockroach sql --insecure --host=localhost:26257 -e \'create database testcockroach4;\''
+                        sh 'make test-sim'
+                    }
+                }
+
                 stage('Backwards Compatibility') {
                     environment {
                         STORJ_NETWORK_HOST4 = '127.0.0.3'
@@ -117,21 +131,6 @@ pipeline {
                     }
                 }
 
-                stage('CockroachDB migration compatibility') {
-                    environment {
-                        STORJ_COCKROACH_TEST = 'cockroach://root@localhost:26257/teststorj?sslmode=disable'
-                        STORJ_POSTGRES_TEST = 'postgres://postgres@localhost/teststorj4?sslmode=disable'
-                    }
-
-                    steps {
-                        // Until we can run all the unit tests with cockroach (i.e. all the sql is fixed to be cockroachdb compatible),
-                        // lets just run a bare bones test here that sets up testplanet and runs the database migration
-                        sh 'psql -U postgres -c \'create database teststorj4;\''
-                        sh 'cockroach sql --insecure --host=localhost:26257 -e \'create database teststorj;\''
-                        sh 'cd private/testplanet && go test ./... -run=TestRun'
-                    }
-                }
-
                stage('Build [gomobile]') {
                     steps {
                         // just to verify its building with recent changes
diff --git a/scripts/test-sim-aws.sh b/scripts/test-sim-aws.sh
index 2f577c1ed..97c02a017 100755
--- a/scripts/test-sim-aws.sh
+++ b/scripts/test-sim-aws.sh
@@ -12,6 +12,10 @@ SRC_DIR=$TMPDIR/source
 DST_DIR=$TMPDIR/dst
 mkdir -p "$SRC_DIR" "$DST_DIR"
 
+
+export AWS_CONFIG_FILE=$TMPDIR/.aws/config
+export AWS_SHARED_CREDENTIALS_FILE=$TMPDIR/.aws/credentials
+
 aws configure set aws_access_key_id     "$GATEWAY_0_ACCESS_KEY"
 aws configure set aws_secret_access_key "$GATEWAY_0_SECRET_KEY"
 aws configure set default.region        us-east-1
diff --git a/scripts/test-uplink.sh b/scripts/test-uplink.sh
index 1616f3ad0..72e835a01 100755
--- a/scripts/test-uplink.sh
+++ b/scripts/test-uplink.sh
@@ -22,10 +22,10 @@ random_bytes_file () {
     head -c $size </dev/urandom > $output
 }
 
-random_bytes_file "2KiB"    "$SRC_DIR/small-upload-testfile"          # create 2kb file of random bytes (inline)
-random_bytes_file "5MiB"    "$SRC_DIR/big-upload-testfile"            # create 5mb file of random bytes (remote)
-random_bytes_file "12MiB"   "$SRC_DIR/multisegment-upload-testfile"   # create 2 x 6mb file of random bytes (remote) 
-random_bytes_file "9MiB"    "$SRC_DIR/diff-size-segments"             # create 9mb file of random bytes (remote)
+random_bytes_file "2048"       "$SRC_DIR/small-upload-testfile"          # create 2kb file of random bytes (inline)
+random_bytes_file "5242880"    "$SRC_DIR/big-upload-testfile"            # create 5mb file of random bytes (remote)
+random_bytes_file "12582912"   "$SRC_DIR/multisegment-upload-testfile"   # create 2 x 6mb file of random bytes (remote)
+random_bytes_file "9437184"    "$SRC_DIR/diff-size-segments"             # create 9mb file of random bytes (remote)
 
 UPLINK_DEBUG_ADDR=""