diff --git a/config/docker/danbooru-base b/config/docker/danbooru-base
index df05e6c38..56592b915 100644
--- a/config/docker/danbooru-base
+++ b/config/docker/danbooru-base
@@ -6,7 +6,7 @@ RUN apt-get -y install wget
 RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-RUN apt-get -y install -qq apt-utils build-essential automake libssl-dev libxml2-dev libxslt-dev ncurses-dev sudo libreadline-dev flex bison ragel memcached libmemcached-dev git curl libcurl4-openssl-dev imagemagick libmagickcore-dev libmagickwand-dev sendmail-bin sendmail postgresql-client libpq-dev nginx ssh coreutils libavcodec-dev mkvtoolnix emacs24-nox telnet libvips42 libvips-tools libvips-dev > /dev/null
+RUN apt-get -y install -qq apt-utils build-essential automake libssl-dev libxml2-dev libxslt-dev ncurses-dev sudo libreadline-dev flex bison ragel memcached libmemcached-dev git curl libcurl4-openssl-dev imagemagick libmagickcore-dev libmagickwand-dev sendmail-bin sendmail postgresql-client libpq-dev nginx ssh coreutils ffmpeg mkvtoolnix emacs24-nox telnet libvips42 libvips-tools libvips-dev > /dev/null
 RUN useradd -ms /bin/bash danbooru -u 1000
 RUN mkdir /app
 RUN mkdir -p /var/www/danbooru/shared/data
diff --git a/config/docker/danbooru-ci b/config/docker/danbooru-ci
index 1904eb10a..4f4c014e7 100644
--- a/config/docker/danbooru-ci
+++ b/config/docker/danbooru-ci
@@ -3,7 +3,6 @@
 FROM r888888888/danbooru-base
 
 USER root
-RUN apt-get install -y ffmpeg
 COPY . /app
 RUN chown -R danbooru:danbooru .
 USER danbooru
diff --git a/test/factories/user.rb b/test/factories/user.rb
index e4511807d..c3e4985d1 100644
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory(:user, aliases: [:creator, :updater]) do
-    name {(rand(1_000_000) + 10).to_s}
+    sequence :name do |n|
+      "user#{n}"
+    end
     password "password"
     password_hash {User.sha1("password")}
     email {FFaker::Internet.email}