diff --git a/spec/operators/delay-spec.ts b/spec/operators/delay-spec.ts
index 66965ccc35..a167c54bfa 100644
--- a/spec/operators/delay-spec.ts
+++ b/spec/operators/delay-spec.ts
@@ -11,10 +11,10 @@ declare const rxTestScheduler: TestScheduler;
 /** @test {delay} */
 describe('delay operator', () => {
   asDiagram('delay(20)')('should delay by specified timeframe', () => {
-    const e1 =   hot('---a--b--|  ');
-    const t =   time(   '--|      ');
-    const expected = '-----a--b--|';
-    const subs =     '^        !  ';
+    const e1 =   hot('---a--b--|');
+    const t =   time(   '--|    ');
+    const expected = '-----a--b|';
+    const subs =     '^        !';
 
     const result = e1.pipe(delay(t, rxTestScheduler));
 
@@ -25,7 +25,7 @@ describe('delay operator', () => {
   it('should delay by absolute time period', () => {
     const e1 =   hot('--a--b--|   ');
     const t =   time(  '---|      ');
-    const expected = '-----a--b--|';
+    const expected = '-----a--(b|)';
     const subs =     '^       !   ';
 
     const absoluteDelay = new Date(rxTestScheduler.now() + t);
@@ -38,7 +38,7 @@ describe('delay operator', () => {
   it('should delay by absolute time period after subscription', () => {
     const e1 =   hot('---^--a--b--|   ');
     const t =   time(      '---|      ');
-    const expected =    '------a--b--|';
+    const expected =    '------a--(b|)';
     const subs =        '^        !   ';
 
     const absoluteDelay = new Date(rxTestScheduler.now() + t);
@@ -86,10 +86,10 @@ describe('delay operator', () => {
     expectSubscriptions(e1.subscriptions).toBe(e1Sub);
   });
 
-  it('should delay when source does not emits', () => {
+  it('should not delay when source does not emits', () => {
     const e1 =   hot('----|   ');
     const t =   time(    '---|');
-    const expected = '-------|';
+    const expected = '----|';
     const subs =     '^   !   ';
 
     const result = e1.pipe(delay(t, rxTestScheduler));
@@ -98,10 +98,20 @@ describe('delay operator', () => {
     expectSubscriptions(e1.subscriptions).toBe(subs);
   });
 
-  it('should delay when source is empty', () => {
+  it('should not delay when source is empty', () => {
     const e1 =  cold('|');
     const t =   time('---|');
-    const expected = '---|';
+    const expected = '|';
+
+    const result = e1.pipe(delay(t, rxTestScheduler));
+
+    expectObservable(result).toBe(expected);
+  });
+
+  it('should delay complete when a value is scheduled', () => {
+    const e1 =  cold('-a-|');
+    const t =   time('---|');
+    const expected = '----(a|)';
 
     const result = e1.pipe(delay(t, rxTestScheduler));
 
diff --git a/spec/operators/mergeScan-spec.ts b/spec/operators/mergeScan-spec.ts
index bdd8f3fee6..147a6322ec 100644
--- a/spec/operators/mergeScan-spec.ts
+++ b/spec/operators/mergeScan-spec.ts
@@ -320,7 +320,7 @@ describe('mergeScan', () => {
   it('should emit accumulator if inner completes without value after source completes', () => {
     const e1 = hot('--a--^--b--c--d--e--f--g--|');
     const e1subs =      '^                    !';
-    const expected =    '-----------------------(x|)';
+    const expected =    '---------------------(x|)';
 
     const source = e1.pipe(
       mergeScan((acc, x) => EMPTY.delay(50, rxTestScheduler), ['1'])
diff --git a/spec/schedulers/TestScheduler-spec.ts b/spec/schedulers/TestScheduler-spec.ts
index 03b4739d0b..d60c1be65f 100644
--- a/spec/schedulers/TestScheduler-spec.ts
+++ b/spec/schedulers/TestScheduler-spec.ts
@@ -376,7 +376,7 @@ describe('TestScheduler', () => {
         const output = cold('-a|').pipe(
           delay(1000 * 10)
         );
-        const expected = '   - 10s a|';
+        const expected = '   - 10s (a|)';
         expectObservable(output).toBe(expected);
       });
     });
diff --git a/src/internal/operators/delay.ts b/src/internal/operators/delay.ts
index 3689e60f01..6c2ea654b0 100644
--- a/src/internal/operators/delay.ts
+++ b/src/internal/operators/delay.ts
@@ -97,6 +97,9 @@ class DelaySubscriber<T> extends Subscriber<T> {
     if (queue.length > 0) {
       const delay = Math.max(0, queue[0].time - scheduler.now());
       this.schedule(state, delay);
+    } else if (source.isStopped) {
+      source.destination.complete();
+      source.active = false;
     } else {
       this.unsubscribe();
       source.active = false;
@@ -143,7 +146,9 @@ class DelaySubscriber<T> extends Subscriber<T> {
   }
 
   protected _complete() {
-    this.scheduleNotification(Notification.createComplete());
+    if (this.queue.length === 0) {
+      this.destination.complete();
+    }
     this.unsubscribe();
   }
 }