diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff7b8aa..6c32def 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,13 +15,19 @@ jobs:
     - name: Install dependencies
       run: sudo apt install libusb-1.0-0-dev clang-tools
 
+    - name: Clone latest vcam
+      run: |
+        git clone https://github.com/petabyt/vcam
+        cd vcam
+        make libusb.so
+
     - name: Build
       run: |
         scan-build make libcamlib.so
         make dec
 
-    - name: Unit test script
-      run: bash test/ci.sh
+    - name: Run main unit test
+      run: make test
 
   macOS-build:
     runs-on: macos-latest
diff --git a/test/ci-config.mak b/test/ci-config.mak
deleted file mode 100644
index 679216d..0000000
--- a/test/ci-config.mak
+++ /dev/null
@@ -1 +0,0 @@
-LDFLAGS=-L../vcam/ -Wl,-rpath=../vcam/ -lusb -lexif
diff --git a/test/ci.sh b/test/ci.sh
deleted file mode 100644
index 8f35181..0000000
--- a/test/ci.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e 
-set -o pipefail
-
-cp test/ci-config.mak config.mak
-cd ..
-# In the future, this will be a fixed branch or stable release
-git clone https://github.com/petabyt/vcam
-cd vcam
-make libusb.so
-cd ../camlib
-make test-ci
-./test-ci
diff --git a/test/config-fuji.mak b/test/config-fuji.mak
deleted file mode 100644
index 0991d68..0000000
--- a/test/config-fuji.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-connect:
-	systemctl stop NetworkManager
-	iwconfig wlp0s20f3 essid "FUJIFILM-X-A2-5DBC"
-	dhclient wlp0s20f3
-
-fix:
-	systemctl start NetworkManager
-
-canon:
-	systemctl stop NetworkManager
-	iwconfig wlp0s20f3 essid "EOST6{-361_Canon0A" key s:19549284 [2]
-	dhclient wlp0s20f3
diff --git a/test/myci-config.mak b/test/myci-config.mak
deleted file mode 100644
index 5319863..0000000
--- a/test/myci-config.mak
+++ /dev/null
@@ -1 +0,0 @@
-LDFLAGS=-L../vcam/ -lusb -Wl,-rpath=../vcam/ -lexif
diff --git a/test/myci.sh b/test/myci.sh
deleted file mode 100644
index 3c74b94..0000000
--- a/test/myci.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e 
-set -o pipefail
-
-cp test/myci-config.mak config.mak
-cd ../vcam/
-make libusb.so
-cd ../camlib
-make test-ci && ./test-ci
-echo "test return value: $?"
-
-rm config.mak
diff --git a/test/test.d b/test/test.d
deleted file mode 100644
index c6963a4..0000000
--- a/test/test.d
+++ /dev/null
@@ -1,2 +0,0 @@
-test/test.o: test/test.c src/camlib.h src/ptp.h src/cl_data.h \
- src/cl_backend.h src/cl_ops.h src/cl_enum.h src/cl_bind.h