diff --git a/tests/TestCase/ORM/AssociationTest.php b/tests/TestCase/ORM/AssociationTest.php
index 3575b48d3be..6463462016f 100644
--- a/tests/TestCase/ORM/AssociationTest.php
+++ b/tests/TestCase/ORM/AssociationTest.php
@@ -100,13 +100,28 @@ public function testOptionsIsCalled()
     /**
      * Tests that name() returns the correct configure association name
      *
+     * @group deprecated
      * @return void
      */
     public function testName()
     {
-        $this->assertEquals('Foo', $this->association->name());
-        $this->association->name('Bar');
-        $this->assertEquals('Bar', $this->association->name());
+        $this->deprecated(function () {
+            $this->assertEquals('Foo', $this->association->name());
+            $this->association->name('Bar');
+            $this->assertEquals('Bar', $this->association->name());
+        });
+    }
+
+    /**
+     * Tests that setName()
+     *
+     * @return void
+     */
+    public function testSetName()
+    {
+        $this->assertEquals('Foo', $this->association->getName());
+        $this->assertSame($this->association, $this->association->setName('Bar'));
+        $this->assertEquals('Bar', $this->association->getName());
     }
 
     /**
@@ -231,24 +246,53 @@ public function testTargetTableDescendant()
     /**
      * Tests that cascadeCallbacks() returns the correct configured value
      *
+     * @group deprecated
      * @return void
      */
     public function testCascadeCallbacks()
     {
-        $this->assertSame(false, $this->association->cascadeCallbacks());
-        $this->association->cascadeCallbacks(true);
-        $this->assertSame(true, $this->association->cascadeCallbacks());
+        $this->deprecated(function () {
+            $this->assertSame(false, $this->association->cascadeCallbacks());
+            $this->association->cascadeCallbacks(true);
+            $this->assertSame(true, $this->association->cascadeCallbacks());
+        });
+    }
+
+    /**
+     * Tests that cascadeCallbacks() returns the correct configured value
+     *
+     * @return void
+     */
+    public function testSetCascadeCallbacks()
+    {
+        $this->assertFalse($this->association->getCascadeCallbacks());
+        $this->assertSame($this->association, $this->association->setCascadeCallbacks(true));
+        $this->assertTrue($this->association->getCascadeCallbacks());
     }
 
     /**
      * Tests the bindingKey method as a setter/getter
      *
+     * @group deprecated
      * @return void
      */
     public function testBindingKey()
     {
-        $this->association->bindingKey('foo_id');
-        $this->assertEquals('foo_id', $this->association->bindingKey());
+        $this->deprecated(function () {
+            $this->association->bindingKey('foo_id');
+            $this->assertEquals('foo_id', $this->association->bindingKey());
+        });
+    }
+
+    /**
+     * Tests the bindingKey method as a setter/getter
+     *
+     * @return void
+     */
+    public function testSetBindingKey()
+    {
+        $this->assertSame($this->association, $this->association->setBindingKey('foo_id'));
+        $this->assertEquals('foo_id', $this->association->getBindingKey());
     }
 
     /**
@@ -263,7 +307,7 @@ public function testBindingKeyDefault()
             ->expects($this->once())
             ->method('isOwningSide')
             ->will($this->returnValue(true));
-        $result = $this->association->bindingKey();
+        $result = $this->association->getBindingKey();
         $this->assertEquals(['id', 'site_id'], $result);
     }
 
@@ -277,39 +321,70 @@ public function testBindingDefaultNoOwningSide()
     {
         $target = new Table;
         $target->primaryKey(['foo', 'site_id']);
-        $this->association->target($target);
+        $this->association->setTarget($target);
 
         $this->association
             ->expects($this->once())
             ->method('isOwningSide')
             ->will($this->returnValue(false));
-        $result = $this->association->bindingKey();
+        $result = $this->association->getBindingKey();
         $this->assertEquals(['foo', 'site_id'], $result);
     }
 
     /**
      * Tests that name() returns the correct configured value
      *
+     * @group deprecated
      * @return void
      */
     public function testForeignKey()
     {
-        $this->assertEquals('a_key', $this->association->foreignKey());
-        $this->association->foreignKey('another_key');
-        $this->assertEquals('another_key', $this->association->foreignKey());
+        $this->deprecated(function () {
+            $this->assertEquals('a_key', $this->association->foreignKey());
+            $this->association->foreignKey('another_key');
+            $this->assertEquals('another_key', $this->association->foreignKey());
+        });
+    }
+
+    /**
+     * Tests setForeignKey()
+     *
+     * @return void
+     */
+    public function testSetForeignKey()
+    {
+        $this->assertEquals('a_key', $this->association->getForeignKey());
+        $this->assertSame($this->association, $this->association->setForeignKey('another_key'));
+        $this->assertEquals('another_key', $this->association->getForeignKey());
     }
 
     /**
      * Tests that conditions() returns the correct configured value
      *
+     * @group deprecated
      * @return void
      */
     public function testConditions()
     {
-        $this->assertEquals(['field' => 'value'], $this->association->conditions());
+        $this->deprecated(function () {
+            $this->assertEquals(['field' => 'value'], $this->association->conditions());
+            $conds = ['another_key' => 'another value'];
+            $this->association->conditions($conds);
+            $this->assertEquals($conds, $this->association->conditions());
+        });
+    }
+
+    /**
+     * Tests setConditions()
+     *
+     * @return void
+     */
+    public function testSetConditions()
+    {
+        $this->assertEquals(['field' => 'value'], $this->association->getConditions());
         $conds = ['another_key' => 'another value'];
-        $this->association->conditions($conds);
-        $this->assertEquals($conds, $this->association->conditions());
+        $this->assertSame($this->association, $this->association->setConditions($conds));
+        $this->assertEquals($conds, $this->association->getConditions());
     }
 
     /**
@@ -325,16 +400,34 @@ public function testCanBeJoined()
     /**
      * Tests that target() returns the correct Table object
      *
+     * @group deprecated
      * @return void
      */
     public function testTarget()
     {
-        $table = $this->association->target();
+        $this->deprecated(function () {
+            $table = $this->association->target();
+            $this->assertInstanceOf(__NAMESPACE__ . '\TestTable', $table);
+
+            $other = new Table;
+            $this->association->target($other);
+            $this->assertSame($other, $this->association->target());
+        });
+    }
+
+    /**
+     * Tests that setTarget()
+     *
+     * @return void
+     */
+    public function testSetTarget()
+    {
+        $table = $this->association->getTarget();
         $this->assertInstanceOf(__NAMESPACE__ . '\TestTable', $table);
 
         $other = new Table;
-        $this->association->target($other);
-        $this->assertSame($other, $this->association->target());
+        $this->assertSame($this->association, $this->association->setTarget($other));
+        $this->assertSame($other, $this->association->getTarget());
     }
 
     /**
@@ -362,7 +455,7 @@ public function testTargetPlugin()
             ->setConstructorArgs(['ThisAssociationName', $config])
             ->getMock();
 
-        $table = $this->association->target();
+        $table = $this->association->getTarget();
         $this->assertInstanceOf('TestPlugin\Model\Table\CommentsTable', $table);
 
         $this->assertTrue(
@@ -375,48 +468,96 @@ public function testTargetPlugin()
 
         $plugin = TableRegistry::get('TestPlugin.ThisAssociationName');
         $this->assertSame($table, $plugin, 'Should be an instance of TestPlugin.Comments');
-        $this->assertSame('TestPlugin.ThisAssociationName', $table->registryAlias());
-        $this->assertSame('comments', $table->table());
-        $this->assertSame('ThisAssociationName', $table->alias());
+        $this->assertSame('TestPlugin.ThisAssociationName', $table->getRegistryAlias());
+        $this->assertSame('comments', $table->getTable());
+        $this->assertSame('ThisAssociationName', $table->getAlias());
     }
 
     /**
      * Tests that source() returns the correct Table object
      *
+     * @group deprecated
      * @return void
      */
     public function testSource()
     {
-        $table = $this->association->source();
+        $this->deprecated(function () {
+            $table = $this->association->source();
+            $this->assertSame($this->source, $table);
+
+            $other = new Table;
+            $this->association->source($other);
+            $this->assertSame($other, $this->association->source());
+        });
+    }
+
+    /**
+     * Tests that source() returns the correct Table object
+     *
+     * @return void
+     */
+    public function testSetSource()
+    {
+        $table = $this->association->getSource();
         $this->assertSame($this->source, $table);
 
         $other = new Table;
-        $this->association->source($other);
-        $this->assertSame($other, $this->association->source());
+        $this->assertSame($this->association, $this->association->setSource($other));
+        $this->assertSame($other, $this->association->getSource());
     }
 
     /**
      * Tests joinType method
      *
+     * @group deprecated
      * @return void
      */
     public function testJoinType()
     {
-        $this->assertEquals('INNER', $this->association->joinType());
-        $this->association->joinType('LEFT');
-        $this->assertEquals('LEFT', $this->association->joinType());
+        $this->deprecated(function () {
+            $this->assertEquals('INNER', $this->association->joinType());
+            $this->association->joinType('LEFT');
+            $this->assertEquals('LEFT', $this->association->joinType());
+        });
+    }
+
+    /**
+     * Tests setJoinType method
+     *
+     * @return void
+     */
+    public function testSetJoinType()
+    {
+        $this->assertEquals('INNER', $this->association->getJoinType());
+        $this->assertSame($this->association, $this->association->setJoinType('LEFT'));
+        $this->assertEquals('LEFT', $this->association->getJoinType());
     }
 
     /**
      * Tests property method
      *
+     * @group deprecated
      * @return void
      */
     public function testProperty()
     {
-        $this->assertEquals('foo', $this->association->property());
-        $this->association->property('thing');
-        $this->assertEquals('thing', $this->association->property());
+        $this->deprecated(function () {
+            $this->assertEquals('foo', $this->association->property());
+            $this->association->property('thing');
+            $this->assertEquals('thing', $this->association->property());
+        });
+    }
+
+    /**
+     * Tests property method
+     *
+     * @return void
+     */
+    public function testSetProperty()
+    {
+        $this->assertEquals('foo', $this->association->getProperty());
+        $this->assertSame($this->association, $this->association->setProperty('thing'));
+        $this->assertEquals('thing', $this->association->getProperty());
     }
 
     /**
@@ -429,7 +570,7 @@ public function testPropertyNameClash()
         $this->expectException(\PHPUnit\Framework\Error\Warning::class);
         $this->expectExceptionMessageRegExp('/^Association property name "foo" clashes with field of same name of table "test"/');
         $this->source->schema(['foo' => ['type' => 'string']]);
-        $this->assertEquals('foo', $this->association->property());
+        $this->assertEquals('foo', $this->association->getProperty());
     }
 
     /**
@@ -458,7 +599,7 @@ public function testPropertyNameExplicitySet()
             ->setConstructorArgs(['Foo', $config])
             ->getMock();
 
-        $this->assertEquals('foo', $association->property());
+        $this->assertEquals('foo', $association->getProperty());
     }
 
     /**
@@ -468,11 +609,13 @@ public function testPropertyNameExplicitySet()
      */
     public function testStrategy()
     {
-        $this->assertEquals('join', $this->association->strategy());
-        $this->association->strategy('select');
-        $this->assertEquals('select', $this->association->strategy());
-        $this->association->strategy('subquery');
-        $this->assertEquals('subquery', $this->association->strategy());
+        $this->assertEquals('join', $this->association->getStrategy());
+
+        $this->association->setStrategy('select');
+        $this->assertEquals('select', $this->association->getStrategy());
+
+        $this->association->setStrategy('subquery');
+        $this->assertEquals('subquery', $this->association->getStrategy());
     }
 
     /**
@@ -483,20 +626,34 @@ public function testStrategy()
     public function testInvalidStrategy()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->association->strategy('anotherThing');
-        $this->assertEquals('subquery', $this->association->strategy());
+        $this->association->setStrategy('anotherThing');
     }
 
     /**
      * Tests test finder() method as getter and setter
      *
+     * @group deprecated
      * @return void
      */
     public function testFinderMethod()
     {
-        $this->assertEquals('all', $this->association->finder());
-        $this->assertEquals('published', $this->association->finder('published'));
-        $this->assertEquals('published', $this->association->finder());
+        $this->deprecated(function () {
+            $this->assertEquals('all', $this->association->finder());
+            $this->assertEquals('published', $this->association->finder('published'));
+            $this->assertEquals('published', $this->association->finder());
+        });
+    }
+
+    /**
+     * Tests test setFinder() method
+     *
+     * @return void
+     */
+    public function testSetFinderMethod()
+    {
+        $this->assertEquals('all', $this->association->getFinder());
+        $this->assertSame($this->association, $this->association->setFinder('published'));
+        $this->assertEquals('published', $this->association->getFinder());
     }
 
     /**
@@ -522,7 +679,7 @@ public function testFinderInConstructor()
             ])
             ->setConstructorArgs(['Foo', $config])
             ->getMock();
-        $this->assertEquals('published', $assoc->finder());
+        $this->assertEquals('published', $assoc->getFinder());
     }
 
     /**
@@ -533,7 +690,7 @@ public function testFinderInConstructor()
      */
     public function testCustomFinderIsUsed()
     {
-        $this->association->finder('published');
+        $this->association->setFinder('published');
         $this->assertEquals(
             ['this' => 'worked'],
             $this->association->find()->getOptions()