diff --git a/clang.spec b/clang.spec
index f3643ec..d3bdf68 100644
--- a/clang.spec
+++ b/clang.spec
@@ -58,7 +58,7 @@
 
 Name:		%pkg_name
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
-Release:	4%{?rc_ver:.rc%{rc_ver}}%{?dist}
+Release:	5%{?rc_ver:.rc%{rc_ver}}%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -422,6 +422,9 @@ false
 
 %endif
 %changelog
+* Tue Feb 05 2019 sguelton@redhat.com - 7.0.1-5
+- Working CI test suite
+
 * Mon Feb 04 2019 sguelton@redhat.com - 7.0.1-4
 - Workaround gcc-9 bug when compiling bitfields
 
diff --git a/tests/disabledpocl.yml b/tests/disabledpocl.yml
deleted file mode 100644
index f4811fd..0000000
--- a/tests/disabledpocl.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# This is separate from tests.yml because we want to run the tests without
-# clang installed.
-# FIXME: Is there some way we can put this yaml definition in the tests/pocl
-# repo?  Right now we need to copy and paste this everywhere the test is run.
-- hosts: localhost
-  pre_tasks:
-  # Programs linked against pocl should be able to run without clang installed,
-  # so when we run the test we want to make sure clang is not installed to
-  # verify we haven't introduced an implicit dependency on clang.
-  - name: Uninstall clang
-    package:
-      name: clang
-      state: absent
-    tags: classic
-  roles:
-  - role: standard-test-basic
-    tags:
-      - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/pocl.git"
-      dest: "pocl"
-    required_packages:
-      - ocl-icd-devel
-      - pocl
-      - gcc
-    tests:
-    # rhbz#1582884
-    - simple-opencl-no-clang:
-        dir: pocl/simple-opencl-no-clang
-        run: ./runtest.sh
-
-
diff --git a/tests/llvm-abi-test-suite/runtest.sh b/tests/llvm-abi-test-suite/runtest.sh
new file mode 100755
index 0000000..cef0859
--- /dev/null
+++ b/tests/llvm-abi-test-suite/runtest.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+set -x
+
+cp -r /usr/share/llvm-test-suite/ABI-Testsuite .
+cd ABI-Testsuite
+python3 linux-x86.py clang test -v --path /usr/lib64/llvm/ -j 1
diff --git a/tests/llvm-test-suite/runtest.sh b/tests/llvm-test-suite/runtest.sh
new file mode 100755
index 0000000..dd65012
--- /dev/null
+++ b/tests/llvm-test-suite/runtest.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+set -x
+
+cmake -G Ninja /usr/share/llvm-test-suite/ -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DTEST_SUITE_LIT_FLAGS="-svj1"
+ninja -j 1 check
diff --git a/tests/rhbz_1657544/from_chars.cpp b/tests/rhbz_1657544/from_chars.cpp
new file mode 100644
index 0000000..b76be22
--- /dev/null
+++ b/tests/rhbz_1657544/from_chars.cpp
@@ -0,0 +1,15 @@
+#include <charconv>
+#include <iostream>
+#include <cstring>
+
+using namespace std;
+
+int main(int argc, char **argv)
+{
+	size_t r=0;
+	const char *begin = argv[1];
+	const char *end = begin + strlen(begin);
+	from_chars(begin, end, r);
+	cout << r << '\n';
+	return 0;
+}
diff --git a/tests/rhbz_1657544/runtest.sh b/tests/rhbz_1657544/runtest.sh
new file mode 100755
index 0000000..758de0b
--- /dev/null
+++ b/tests/rhbz_1657544/runtest.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+set -x
+
+clang++ from_chars.cpp
+./a.out 100 | grep 100
diff --git a/tests/tests.yml b/tests/tests.yml
index 3fb0db5..ca0e8b8 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -12,12 +12,6 @@
       - rhbz#482491:
           dir: ./
           run: echo "int main(){}" | clang -x c -
-      - llvm-test-suite:
-          dir: ./
-          run: cd $(mktemp -d) && cmake -G Ninja /usr/share/llvm-test-suite/ -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DTEST_SUITE_LIT_FLAGS="-svj1" && ninja -j 1 check
-      - llvm-abi-test-suite:
-          dir: ./
-          run: cd /usr/share/llvm-test-suite/ABI-Testsuite/ && python2 linux-x86.py clang test -v --path /usr/lib64/llvm/ -j 1
-      - rhbz#1657544:
-          dir: ./from_chars
-          run: clang++ from_chars.cpp && ./a.out 100 | grep 100
+      - llvm-test-suite
+      - llvm-abi-test-suite
+      - rhbz_1657544