diff --git a/test/spec/validations/almost_junction.js b/test/spec/validations/almost_junction.js
index 83cef265e..05223d467 100644
--- a/test/spec/validations/almost_junction.js
+++ b/test/spec/validations/almost_junction.js
@@ -126,6 +126,79 @@ describe('iD.validations.almost_junction', function () {
         );
     }
 
+    function closeEndNodesSmallAngle() {
+        // Vertical path
+        var n1 = iD.osmNode({id: 'n-1', loc: [0.0003247, 22.4423866]});
+        var n2 = iD.osmNode({id: 'n-2', loc: [0.0003060, 22.4432671]});
+        var w1 = iD.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'path' }});
+
+        context.perform(
+            iD.actionAddEntity(n1),
+            iD.actionAddEntity(n2),
+            iD.actionAddEntity(w1)
+        );
+
+        // Angled path with end node within 4.25m and change of angle <9°
+        var n3 = iD.osmNode({id: 'n-3', loc: [0.0003379, 22.4423861]});
+        var n4 = iD.osmNode({id: 'n-4', loc: [0.0004354, 22.4421312]});
+        var w2 = iD.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'path' }});
+
+        context.perform(
+            iD.actionAddEntity(n3),
+            iD.actionAddEntity(n4),
+            iD.actionAddEntity(w2)
+        );
+
+        return n1;
+    }
+
+    function closeEndNodesBigAngle() {
+        // Vertical path
+        var n1 = iD.osmNode({id: 'n-1', loc: [0, 22.4427453]});
+        var n2 = iD.osmNode({id: 'n-2', loc: [0, 22.4429806]});
+        var w1 = iD.osmWay({id: 'w-1', nodes: ['n-1', 'n-2'], tags: { highway: 'path' }});
+
+        context.perform(
+            iD.actionAddEntity(n1),
+            iD.actionAddEntity(n2),
+            iD.actionAddEntity(w1)
+        );
+
+        // Horizontal path with end node within 4.25m and change of angle >9°
+        var n3 = iD.osmNode({id: 'n-3', loc: [0.0000199, 22.4427801]});
+        var n4 = iD.osmNode({id: 'n-4', loc: [0.0002038, 22.4427801]});
+        var w2 = iD.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'path' }});
+
+        context.perform(
+            iD.actionAddEntity(n3),
+            iD.actionAddEntity(n4),
+            iD.actionAddEntity(w2)
+        );
+
+        return n1;
+    }
+
+    function closeEndNodesSmallAngleSelf() {
+        // Square path that ends within 4.25m of itself and change of angle <9°
+        var n1 = iD.osmNode({id: 'n-1', loc: [0, 22.4427453]});
+        var n2 = iD.osmNode({id: 'n-2', loc: [0, 22.4429811]});
+        var n3 = iD.osmNode({id: 'n-3', loc: [0.0001923, 22.4429811]});
+        var n4 = iD.osmNode({id: 'n-4', loc: [0.0001923, 22.4427523]});
+        var n5 = iD.osmNode({id: 'n-5', loc: [0.0000134, 22.4427523]});
+        var w1 = iD.osmWay({id: 'w-1', nodes: ['n-1', 'n-2', 'n-3', 'n-4', 'n-5'], tags: { highway: 'path' }});
+
+        context.perform(
+            iD.actionAddEntity(n1),
+            iD.actionAddEntity(n2),
+            iD.actionAddEntity(n3),
+            iD.actionAddEntity(n4),
+            iD.actionAddEntity(n5),
+            iD.actionAddEntity(w1)
+        );
+
+        return n1;
+    }
+
     function validate() {
         var validator = iD.validationAlmostJunction(context);
         var changes = context.history().changes();
@@ -220,4 +293,70 @@ describe('iD.validations.almost_junction', function () {
         expect(issues).to.have.lengthOf(0);
     });
 
+    // TODO: Test case of both endpoints of another way close, should prioritise smaller angle change
+    it('joins close endpoints if insignificant angle change', function() {
+        var n1 = closeEndNodesSmallAngle();
+        var issues = validate();
+        expect(issues).to.have.lengthOf(1);
+        var issue = issues[0];
+        expect(issue.type).to.eql('almost_junction');
+        expect(issue.subtype).to.eql('highway-highway');
+        expect(issue.entityIds).to.have.lengthOf(3);
+        expect(issue.entityIds[0]).to.eql('w-2');
+        expect(issue.entityIds[1]).to.eql('n-3');
+        expect(issue.entityIds[2]).to.eql('w-1');
+
+        // Duplicate edge nodes means endpoints will be joined
+        expect(issue.data.edge).to.have.lengthOf(2);
+        expect(issue.data.edge[0]).to.eql('n-1');
+        expect(issue.data.edge[1]).to.eql('n-1');
+
+        // Crossing set to loc of end node means endpoints will be joined
+        expect(issue.data.cross_loc).to.have.lengthOf(2);
+        expect(issue.data.cross_loc).to.eql(n1.loc);
+    });
+
+    it('won\'t join close endpoints if significant angle change', function() {
+        var n1 = closeEndNodesBigAngle();
+        var issues = validate();
+        expect(issues).to.have.lengthOf(1);
+        var issue = issues[0];
+        expect(issue.type).to.eql('almost_junction');
+        expect(issue.subtype).to.eql('highway-highway');
+        expect(issue.entityIds).to.have.lengthOf(3);
+        expect(issue.entityIds[0]).to.eql('w-2');
+        expect(issue.entityIds[1]).to.eql('n-3');
+        expect(issue.entityIds[2]).to.eql('w-1');
+
+        // Differing edge nodes means endpoints won't be joined
+        expect(issue.data.edge).to.have.lengthOf(2);
+        expect(issue.data.edge[0]).to.eql('n-1');
+        expect(issue.data.edge[1]).to.eql('n-2');
+
+        // Crossing different from loc of end node means endpoints won't be joined
+        expect(issue.data.cross_loc).to.have.lengthOf(2);
+        expect(issue.data.cross_loc).to.not.eql(n1.loc);
+    });
+
+    it('joins close endpoints of the same way', function() {
+        var n1 = closeEndNodesSmallAngleSelf();
+        var issues = validate();
+        expect(issues).to.have.lengthOf(1);
+        var issue = issues[0];
+        expect(issue.type).to.eql('almost_junction');
+        expect(issue.subtype).to.eql('highway-highway');
+        expect(issue.entityIds).to.have.lengthOf(3);
+        expect(issue.entityIds[0]).to.eql('w-1');
+        expect(issue.entityIds[1]).to.eql('n-5');
+        expect(issue.entityIds[2]).to.eql('w-1');
+
+        // Duplicate edge nodes means endpoints will be joined
+        expect(issue.data.edge).to.have.lengthOf(2);
+        expect(issue.data.edge[0]).to.eql('n-1');
+        expect(issue.data.edge[1]).to.eql('n-1');
+
+        // Crossing set to loc of end node means endpoints will be joined
+        expect(issue.data.cross_loc).to.have.lengthOf(2);
+        expect(issue.data.cross_loc).to.eql(n1.loc);
+    });
 });