diff --git a/acceptance/setup/aio/pre-suite/020_AIO_Workarounds.rb b/acceptance/setup/aio/pre-suite/020_AIO_Workarounds.rb
index <HASH>..<HASH> 100644
--- a/acceptance/setup/aio/pre-suite/020_AIO_Workarounds.rb
+++ b/acceptance/setup/aio/pre-suite/020_AIO_Workarounds.rb
@@ -21,14 +21,3 @@ test_name '(PUP-3997) Puppet User and Group on agents only' do
     end
   end
 end
-
-# The codedir setting should be passed into the puppetserver
-# initialization method, like is done for other required settings
-# confdir & vardir. For some reason, puppetserver gets confused
-# if this is not done, and tries to manage a directory:
-# /opt/puppetlabs/agent/cache/.puppet/code, which is a combination
-# of the default master-var-dir in puppetserver, and the user
-# based codedir.
-step "(SERVER-347) Set required codedir setting on puppetserver"
-on master, puppet("config set codedir /etc/puppetlabs/code --section master")
-
(maint) Remove codedir workaround

The workaround for pointing the master's codedir to
/etc/puppetlabs/code is no longer required now that commit f<I>efe<I>
in puppet-server[1] has been promoted.

[1] <URL>