diff --git a/ocaml.spec b/ocaml.spec
index 29c37ff..7d7e3db 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -20,8 +20,7 @@
 %global test_arches aarch64 %{power64} x86_64
 # These are the architectures for which the tests must pass otherwise
 # the build will fail.
-#%global test_arches_required aarch64 ppc64le x86_64
-%global test_arches_required NONE
+%global test_arches_required aarch64 ppc64le x86_64
 
 # Architectures where parallel builds fail.
 #%global no_parallel_build_arches aarch64
@@ -83,15 +82,6 @@ BuildRequires:  gdbm-devel
 BuildRequires:  gawk
 BuildRequires:  perl-interpreter
 BuildRequires:  util-linux
-BuildRequires:  libICE-devel
-BuildRequires:  libSM-devel
-BuildRequires:  libX11-devel
-BuildRequires:  libXaw-devel
-BuildRequires:  libXext-devel
-BuildRequires:  libXft-devel
-BuildRequires:  libXmu-devel
-BuildRequires:  libXrender-devel
-BuildRequires:  libXt-devel
 BuildRequires:  chrpath
 
 Requires:       gcc
@@ -141,15 +131,6 @@ Requires:       ocaml = %{version}-%{release}
 Source code for OCaml libraries.
 
 
-%package x11
-Summary:        X11 support for OCaml
-Requires:       ocaml-runtime = %{version}-%{release}
-Requires:       libX11-devel
-
-%description x11
-X11 support for OCaml.
-
-
 %package ocamldoc
 Summary:        Documentation generator for OCaml
 Requires:       ocaml = %{version}-%{release}
@@ -261,7 +242,6 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
 %{_bindir}/ocamlmklib
 %{_bindir}/ocamlmktop
 %{_bindir}/ocamlobjinfo
-%{_bindir}/ocamloptp
 %{_bindir}/ocamlprof
 
 # bytecode versions
@@ -272,7 +252,6 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
 %{_bindir}/ocamlmklib.byte
 %{_bindir}/ocamlmktop.byte
 %{_bindir}/ocamlobjinfo.byte
-%{_bindir}/ocamloptp.byte
 %{_bindir}/ocamlprof.byte
 
 %if %{native_compiler}
@@ -284,7 +263,6 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
 %{_bindir}/ocamlmklib.opt
 %{_bindir}/ocamlmktop.opt
 %{_bindir}/ocamlobjinfo.opt
-%{_bindir}/ocamloptp.opt
 %{_bindir}/ocamlprof.opt
 %endif
 
@@ -315,8 +293,6 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
 %{_libdir}/ocaml/*.mli
 %{_libdir}/ocaml/libcamlrun_shared.so
 %{_libdir}/ocaml/objinfo_helper
-%{_libdir}/ocaml/vmthreads/*.mli
-%{_libdir}/ocaml/vmthreads/*.a
 %{_libdir}/ocaml/threads/*.mli
 %if %{native_compiler}
 %{_libdir}/ocaml/threads/*.a
@@ -324,7 +300,6 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
 %{_libdir}/ocaml/threads/*.cmx
 %endif
 %{_libdir}/ocaml/caml
-%exclude %{_libdir}/ocaml/graphicsX11.mli
 
 
 %files runtime
@@ -337,17 +312,13 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
 %{_libdir}/ocaml/*.cmo
 %{_libdir}/ocaml/*.cmi
 %{_libdir}/ocaml/*.cma
+%{_libdir}/ocaml/camlheaderd
+%{_libdir}/ocaml/camlheaderi
 %{_libdir}/ocaml/stublibs
-%{_libdir}/ocaml/target_camlheaderd
-%{_libdir}/ocaml/target_camlheaderi
-%dir %{_libdir}/ocaml/vmthreads
-%{_libdir}/ocaml/vmthreads/*.cmi
-%{_libdir}/ocaml/vmthreads/*.cma
 %dir %{_libdir}/ocaml/threads
 %{_libdir}/ocaml/threads/*.cmi
 %{_libdir}/ocaml/threads/*.cma
 %{_libdir}/ocaml/fedora-ocaml-release
-%exclude %{_libdir}/ocaml/graphicsX11.cmi
 
 
 %files source
@@ -355,12 +326,6 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
 %{_libdir}/ocaml/*.ml
 
 
-%files x11
-%doc LICENSE
-%{_libdir}/ocaml/graphicsX11.cmi
-%{_libdir}/ocaml/graphicsX11.mli
-
-
 %files ocamldoc
 %doc LICENSE
 %doc ocamldoc/Changes.txt
@@ -392,6 +357,11 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
 * Thu Dec 05 2019 Richard W.M. Jones <rjones@redhat.com> - 4.09.0-1
 - OCaml 4.09.0 final.
 - Use autosetup, remove old setup line.
+- Remove ocamloptp binaries.
+- Rename target_camlheader[di] -> camlheader[di] files.
+- Remove vmthreads - old threading library which is no longer built.
+- Remove x11 subpackage which is obsolete.
+- Reenable required tests on aarch64, ppc64le and x86_64.
 
 * Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 4.08.1-1
 - OCaml 4.08.1 final.