diff -Nru astropy-3.0.4/debian/changelog astropy-3.0.4/debian/changelog
--- astropy-3.0.4/debian/changelog	2018-08-11 19:23:14.000000000 +0000
+++ astropy-3.0.4/debian/changelog	2018-10-23 23:16:33.000000000 +0000
@@ -1,3 +1,10 @@
+astropy (3.0.4-3+rpi1) buster-staging; urgency=medium
+
+  * Disable testsuite.
+  * Disable documenation build.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 23 Oct 2018 23:16:33 +0000
+
 astropy (3.0.4-3) unstable; urgency=medium
 
   * Unrestrict last, forgotten s390x test xfail
diff -Nru astropy-3.0.4/debian/control astropy-3.0.4/debian/control
--- astropy-3.0.4/debian/control	2018-08-07 14:43:25.000000000 +0000
+++ astropy-3.0.4/debian/control	2018-10-23 23:16:33.000000000 +0000
@@ -68,7 +68,7 @@
  intended to work with the core package.
 
 Package: python-astropy-doc
-Architecture: all
+Architecture: none
 Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends},
diff -Nru astropy-3.0.4/debian/rules astropy-3.0.4/debian/rules
--- astropy-3.0.4/debian/rules	2018-05-17 18:15:28.000000000 +0000
+++ astropy-3.0.4/debian/rules	2018-10-23 23:16:33.000000000 +0000
@@ -13,16 +13,19 @@
 export PYBUILD_AFTER_BUILD=cd {build_dir}; python{version} -c 'import astropy.coordinates; astropy.coordinates.angle_utilities.parse_angle("0°"); import astropy.units.format; astropy.units.format.CDS.parse("m/s"); astropy.units.format.Generic.parse("m"); astropy.units.format.OGIP.parse("m/s")'
 
 %:
-	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_shlibdeps:
 	dh_shlibdeps
 	dh_numpy3
 
 override_dh_installdocs-indep:
-	python3 setup.py build_docs
+	# python3 setup.py build_docs
 	dh_installdocs
 
+override_dh_sphinxdoc-indep:
+	# documentation build disabled
+
 override_dh_sphinxdoc-arch:
 	# sphinxdoc is only needed on indep and does not work here.
 
@@ -42,3 +45,6 @@
 
 override_dh_strip_nondeterminism:
 	dh_strip_nondeterminism -Xinvalid.dat.gz
+
+override_dh_auto_test:
+	echo testsuite disabled