diff --git a/.circleci/config.yml b/.circleci/config.yml
index e36aaa142a5a18..57ca3a91d859d9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,19 +40,6 @@ jobs:
           path: /tmp/misra/misra_safety_output.txt
 
 
-  strict-compiler:
-    machine:
-      docker_layer_caching: true
-    steps:
-      - checkout
-      - run:
-          name: Build image
-          command: "docker build -t panda_strict_compiler -f tests/build_strict/Dockerfile ."
-      - run:
-          name: Build Panda with strict compiler rules
-          command: |
-            docker run panda_strict_compiler /bin/bash -c "cd /panda/tests/build_strict; ./test_build_strict.sh"
-
   build:
     machine:
       docker_layer_caching: true
@@ -105,6 +92,5 @@ workflows:
     jobs:
       - safety
       - misra-c2012
-      - strict-compiler
       - build
       - safety_replay
diff --git a/board/Makefile b/board/Makefile
index ed6dcaa0309fc8..adeba0479a85e9 100644
--- a/board/Makefile
+++ b/board/Makefile
@@ -1,5 +1,5 @@
 PROJ_NAME = panda
-CFLAGS = -g -Wall
+CFLAGS = -g -Wall -Wextra -Wstrict-prototypes -Werror
 
 CFLAGS += -mlittle-endian -mthumb -mcpu=cortex-m4
 CFLAGS += -mhard-float -DSTM32F4 -DSTM32F413xx -mfpu=fpv4-sp-d16 -fsingle-precision-constant
diff --git a/board/Makefile.strict b/board/Makefile.strict
deleted file mode 100644
index b6c72b58b1485a..00000000000000
--- a/board/Makefile.strict
+++ /dev/null
@@ -1,8 +0,0 @@
-PROJ_NAME = panda
-CFLAGS = -g -Wall -Wextra -Wstrict-prototypes
-
-CFLAGS += -mlittle-endian -mthumb -mcpu=cortex-m4
-CFLAGS += -mhard-float -DSTM32F4 -DSTM32F413xx -mfpu=fpv4-sp-d16 -fsingle-precision-constant
-STARTUP_FILE = startup_stm32f413xx
-
-include build.mk
diff --git a/tests/build_strict/Dockerfile b/tests/build_strict/Dockerfile
deleted file mode 100644
index b1c75c0258ef64..00000000000000
--- a/tests/build_strict/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update && apt-get install -y gcc-arm-none-eabi libnewlib-arm-none-eabi python python-pip gcc g++
-
-RUN pip install pycrypto==2.6.1
-
-COPY . /panda
-
-WORKDIR /panda
diff --git a/tests/build_strict/test_build_strict.sh b/tests/build_strict/test_build_strict.sh
deleted file mode 100755
index ee57ba8ad80822..00000000000000
--- a/tests/build_strict/test_build_strict.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash -e
-
-cd ../../board/
-
-make -f Makefile.strict clean
-make -f Makefile.strict bin 2> compiler_output.txt
-
-
-if [[ -s "compiler_output.txt" ]]
-then
-  echo "Found alerts from the compiler:"
-  cat compiler_output.txt
-  exit 1
-fi
-