diff --git a/drkonqi/tests/integration/duplicate_attach_test.rb b/drkonqi/tests/integration/duplicate_attach_test.rb
index 2dab7784f..daaff237a 100644
--- a/drkonqi/tests/integration/duplicate_attach_test.rb
+++ b/drkonqi/tests/integration/duplicate_attach_test.rb
@@ -1,228 +1,228 @@
 # Copyright (C) 2017 Harald Sitter <sitter@kde.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
 # published by the Free Software Foundation; either version 2 of
 # the License or (at your option) version 3 or any later version
 # accepted by the membership of KDE e.V. (or its successor approved
 # by the membership of KDE e.V.), which shall act as a proxy
 # defined in Section 14 of version 3 of the license.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require_relative 'test_helper'
 
 require 'xmlrpc/client'
 require 'xmlrpc/server'
 
 # Monkey patch the xmlrpc server to let us handle regular GET requests.
 # Drkonqi partially goes through regular bugzilla cgi's simply requesting xml
 # output.
 module XMLServerInterceptor
   # raw xml data is here
   # def process(*args)
   #   warn "+++ #{__method__} +++"
   #   p args
   #   warn "--- #{__method__} ---"
   #   super
   # end
 
   def service(req, resp)
     # Where webrick comes in with request, server rejects non-xmlrpc requests
     # so we'll manually handle GET requests as necessary and forward to an
     # actual bugzilla so we don't have to reimplement everything.
     warn "+++ #{__method__} +++"
     if req.request_method == 'GET'
       if req.request_uri.path.include?('buglist.cgi') # Returns CSV.
         resp.body = <<-EOF
 bug_id,"bug_severity","priority","bug_status","product","short_desc","resolution"
 375161,"crash","NOR","NEEDSINFO","dolphin","Dolphin crash, copy from Samba share","BACKTRACE"
         EOF
         return
       end
 
       if req.request_uri.path.include?('show_bug.cgi')
         uri = req.request_uri.dup
         uri.host = 'bugstest.kde.org'
         uri.scheme = 'https'
         uri.port = nil
         resp.set_redirect(WEBrick::HTTPStatus::TemporaryRedirect, uri.to_s)
         return
       end
     end
     warn "--- #{__method__} ---"
     super
   end
 end
 
 class XMLRPC::Server
   prepend XMLServerInterceptor
 
   # Expose webrick server so we can get our port :|
   # https://github.com/ruby/xmlrpc/issues/17
   attr_accessor :server
 end
 
 class TestDuplicateAttach < ATSPITest
   def setup
     server = XMLRPC::Server.new(0)
     port = server.server.config.fetch(:Port)
     ENV['DRKONQI_KDE_BUGZILLA_URL'] = "http://localhost:#{port}/"
 
     @got_comment = false
 
     server.set_default_handler do |name, args|
       puts '+++ handler +++'
       p name, args
       if name == 'User.login'
         next {"id"=>12345, "token"=>"12345-cJ5o717AbC"}
       end
       if name == 'Bug.update'
         id = args.fetch('ids').fetch(0)
         cc_to_add = args.fetch('cc').fetch('add')
         next {"bugs"=>[{"last_change_time"=>DateTime.now, "id"=>id, "changes"=>{"cc"=>{"removed"=>"", "added"=>cc_to_add}}, "alias"=>[]}]}
       end
       if name == 'Bug.add_attachment'
         # Check for garbage string from test
         @got_comment = args.fetch('comment').include?('yyyyyyyyyyyyyyyy')
         next { "ids" => [1234] }
       end
       puts '~~~ bugzilla ~~~'
       # Pipe request through bugstest.
       # The arguments are killing me.
       client = XMLRPC::Client.new('bugstest.kde.org', '/xmlrpc.cgi', 443,
                                   nil, nil, nil, nil, true)
       bugzilla = client.call(name, *args)
       p bugzilla
       next bugzilla
     end
 
     @xml_server_thread = Thread.start { server.serve }
 
     @tracee = fork { loop { sleep(999_999_999) } }
 
     assert File.exist?(DRKONQI_PATH), "drkonqi not at #{DRKONQI_PATH}"
     @drkonqi_pid = spawn(DRKONQI_PATH,
                          '--signal', '11',
                          '--pid', @tracee.to_s,
                          '--bugaddress', 'submit@bugs.kde.org',
                          '--dialog')
     puts "pid: #{@drkonqi_pid}"
   end
 
   def teardown
     Process.kill('KILL', @tracee)
     Process.waitpid2(@tracee)
     @xml_server_thread.kill
     @xml_server_thread.join
   end
 
   def drkonqi_running?
     Process.waitpid(@drkonqi_pid, Process::WNOHANG).nil?
   end
 
   # When evaluating duplicates
   def test_duplicate_attach
     drkonqi = nil
 
     8.times do # be gracious for drkonqi to come up an atspi
-      drkonqi = ATSPI.desktops[0].applications.find { |x| x.name == 'drkonqi' }
+      drkonqi = ATSPI.applications.find { |x| x.name == 'drkonqi' }
       break if drkonqi
       sleep 2
     end
 
     refute_nil drkonqi, 'Could not find drkonqi on atspi api.' \
                         " It is running: #{drkonqi_running?}"
 
     accessible = find_in(drkonqi.windows[-1], name: 'Report Bug')
     press(accessible)
 
     find_in(drkonqi, name: 'Crash Reporting Assistant') do |window|
       accessible = find_in(window, name: 'Next')
       press(accessible)
 
       accessible = find_in(window, name: 'Yes')
       toggle_on(accessible)
 
       accessible = find_in(window, name: /^What I was doing when the application.+/)
       toggle_on(accessible)
 
       accessible = find_in(window, name: 'Next')
       press(accessible)
 
       loop do
         # Drkonqi is now doing the trace, wait until it is done.
         accessible = find_in(window, name: 'Next')
         refute_nil accessible
         if accessible.states.include?(:sensitive)
           press(accessible)
           break
         end
         warn accessible.states
         sleep 2
       end
 
       # Set pseudo login data if there are none.
       accessible = find_in(window, name: 'Username input')
       accessible.text.set_to 'xxx' if accessible.text.length <= 0
       accessible = find_in(window, name: 'Password input')
       accessible.text.set_to 'yyy' if accessible.text.length <= 0
 
       accessible = find_in(window, name: 'Login')
       press(accessible)
 
       sleep 2 # Wait for login and bug listing
 
       accessible = find_in(window, name: '375161')
       toggle_on(accessible)
 
       accessible = find_in(window, name: 'Open selected report')
       press(accessible)
     end
 
     find_in(drkonqi, name: 'Bug Description') do |window|
       accessible = find_in(window, name: 'Suggest this crash is related')
       press(accessible)
     end
 
     find_in(drkonqi, name: 'Related Bug Report') do |window|
       accessible = find_in(window, name: /^Completely sure: attach my information.+/)
       toggle_on(accessible)
 
       accessible = find_in(window, name: 'Continue')
       press(accessible)
     end
 
     find_in(drkonqi, name: 'Crash Reporting Assistant') do |window|
       accessible = find_in(window, name: /^The report is going to be attached.+/)
       refute_nil accessible
 
       accessible = find_in(window, name: 'Next')
       press(accessible)
 
       accessible = find_in(window, name: 'Information about the crash text')
       accessible.text.set_to(accessible.text.to_s +
         Array.new(128).collect { 'y' }.join)
 
       accessible = find_in(window, name: 'Next')
       press(accessible)
 
       accessible = find_in(window, name: 'Next')
       press(accessible)
 
       accessible = find_in(window, name: /.*Crash report sent.*/)
       refute_nil accessible
 
       accessible = find_in(window, name: 'Finish')
       press(accessible)
     end
 
     assert @got_comment # only true iff the server go tour yyyyyy garbage string
   end
 end