diff --git a/.builds/.freebsd.yaml b/.builds/.freebsd.yaml
index 1eed203b..29c947fa 100644
--- a/.builds/.freebsd.yaml
+++ b/.builds/.freebsd.yaml
@@ -1,12 +1,11 @@
 image: freebsd/latest
 packages:
   - gmake
-  - gcc
 tasks:
   - build: |
       cd janet
-      gmake CC=gcc
-      gmake test CC=gcc
-      sudo gmake install CC=gcc
-      sudo gmake test-install CC=gcc
-      gmake test-amalg CC=gcc
+      gmake
+      gmake test
+      sudo gmake install
+      gmake test-install
+      gmake test-amalg
diff --git a/.builds/.openbsd.yaml b/.builds/.openbsd.yaml
index c75729cc..005b8b58 100644
--- a/.builds/.openbsd.yaml
+++ b/.builds/.openbsd.yaml
@@ -7,5 +7,5 @@ tasks:
       gmake
       gmake test
       doas gmake install
-      doas gmake test-install
+      gmake test-install
       gmake test-amalg
diff --git a/.travis.yml b/.travis.yml
index aa09a2b2..64bb8b5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ script:
 - make
 - make test
 - sudo make install
-- sudo make test-install
+- make test-install
 - make test-amalg
 - make build/janet-${TRAVIS_TAG}-${TRAVIS_OS_NAME}.tar.gz
 compiler:
diff --git a/Makefile b/Makefile
index 87df0f1e..f25cc83a 100644
--- a/Makefile
+++ b/Makefile
@@ -322,7 +322,7 @@ clean:
 	-rm -rf build vgcore.* callgrind.*
 
 test-install:
-	cd test/install && rm -rf build && jpm build && jpm test && jpm install && jpm uninstall
+	cd test/install && rm -rf build && jpm build && jpm test
 
 build/embed_janet.o: build/janet.c $(JANET_HEADERS)
 	$(CC) $(CFLAGS) -c $< -o $@